projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 1.26
[debian/tar]
/
gnu
/
xalloc.h
diff --git
a/gnu/xalloc.h
b/gnu/xalloc.h
index 400019c63d2ef03b0aca152c23ceeecb9465b9e1..e1da06274edee5e4fd4ee348a01217055532d49f 100644
(file)
--- a/
gnu/xalloc.h
+++ b/
gnu/xalloc.h
@@
-2,9
+2,7
@@
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* xalloc.h -- malloc with out-of-memory checking
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* xalloc.h -- malloc with out-of-memory checking
- Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- Inc.
+ Copyright (C) 1990-2000, 2003-2004, 2006-2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-30,30
+28,22
@@
extern "C" {
# endif
# endif
-# ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-# define __attribute__(x)
-# endif
-# endif
-
-# ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# else
+# define _GL_ATTRIBUTE_NORETURN /* empty */
# endif
# endif
-# ifndef ATTRIBUTE_MALLOC
-# if __GNUC__ >= 3
-# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-# else
-# define ATTRIBUTE_MALLOC
-# endif
+# if __GNUC__ >= 3
+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+# define _GL_ATTRIBUTE_MALLOC
# endif
# endif
-# ifndef ATTRIBUTE_ALLOC_SIZE
-# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-# define ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
-# else
-# define ATTRIBUTE_ALLOC_SIZE(args)
-# endif
+# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
+# else
+# define _GL_ATTRIBUTE_ALLOC_SIZE(args)
# endif
/* This function is always triggered when memory is exhausted.
# endif
/* This function is always triggered when memory is exhausted.
@@
-61,21
+51,21
@@
extern "C" {
or by using gnulib's xalloc-die module. This is the
function to call when one wants the program to die because of a
memory allocation failure. */
or by using gnulib's xalloc-die module. This is the
function to call when one wants the program to die because of a
memory allocation failure. */
-extern void xalloc_die (void) ATTRIBUTE_NORETURN;
+extern void xalloc_die (void)
_GL_
ATTRIBUTE_NORETURN;
void *xmalloc (size_t s)
void *xmalloc (size_t s)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1));
void *xzalloc (size_t s)
void *xzalloc (size_t s)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1));
void *xcalloc (size_t n, size_t s)
void *xcalloc (size_t n, size_t s)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1, 2));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1, 2));
void *xrealloc (void *p, size_t s)
void *xrealloc (void *p, size_t s)
- ATTRIBUTE_ALLOC_SIZE ((2));
+
_GL_
ATTRIBUTE_ALLOC_SIZE ((2));
void *x2realloc (void *p, size_t *pn);
void *xmemdup (void const *p, size_t s)
void *x2realloc (void *p, size_t *pn);
void *xmemdup (void const *p, size_t s)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((2));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((2));
char *xstrdup (char const *str)
char *xstrdup (char const *str)
- ATTRIBUTE_MALLOC;
+
_GL_
ATTRIBUTE_MALLOC;
/* Return 1 if an array of N objects, each of size S, cannot exist due
to size arithmetic overflow. S must be positive and N must be
/* Return 1 if an array of N objects, each of size S, cannot exist due
to size arithmetic overflow. S must be positive and N must be
@@
-123,12
+113,12
@@
char *xstrdup (char const *str)
# define static_inline static inline
# else
void *xnmalloc (size_t n, size_t s)
# define static_inline static inline
# else
void *xnmalloc (size_t n, size_t s)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1, 2));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1, 2));
void *xnrealloc (void *p, size_t n, size_t s)
void *xnrealloc (void *p, size_t n, size_t s)
- ATTRIBUTE_ALLOC_SIZE ((2, 3));
+
_GL_
ATTRIBUTE_ALLOC_SIZE ((2, 3));
void *x2nrealloc (void *p, size_t *pn, size_t s);
char *xcharalloc (size_t n)
void *x2nrealloc (void *p, size_t *pn, size_t s);
char *xcharalloc (size_t n)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1));
# endif
# ifdef static_inline
# endif
# ifdef static_inline
@@
-137,7
+127,7
@@
char *xcharalloc (size_t n)
dynamically, with error checking. S must be nonzero. */
static_inline void *xnmalloc (size_t n, size_t s)
dynamically, with error checking. S must be nonzero. */
static_inline void *xnmalloc (size_t n, size_t s)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1, 2));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1, 2));
static_inline void *
xnmalloc (size_t n, size_t s)
{
static_inline void *
xnmalloc (size_t n, size_t s)
{
@@
-150,7
+140,7
@@
xnmalloc (size_t n, size_t s)
objects each of S bytes, with error checking. S must be nonzero. */
static_inline void *xnrealloc (void *p, size_t n, size_t s)
objects each of S bytes, with error checking. S must be nonzero. */
static_inline void *xnrealloc (void *p, size_t n, size_t s)
- ATTRIBUTE_ALLOC_SIZE ((2, 3));
+
_GL_
ATTRIBUTE_ALLOC_SIZE ((2, 3));
static_inline void *
xnrealloc (void *p, size_t n, size_t s)
{
static_inline void *
xnrealloc (void *p, size_t n, size_t s)
{
@@
-252,7
+242,7
@@
x2nrealloc (void *p, size_t *pn, size_t s)
except it returns char *. */
static_inline char *xcharalloc (size_t n)
except it returns char *. */
static_inline char *xcharalloc (size_t n)
-
ATTRIBUTE_MALLOC
ATTRIBUTE_ALLOC_SIZE ((1));
+
_GL_ATTRIBUTE_MALLOC _GL_
ATTRIBUTE_ALLOC_SIZE ((1));
static_inline char *
xcharalloc (size_t n)
{
static_inline char *
xcharalloc (size_t n)
{