projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xgetcwd: Move AC_LIBOBJ invocations to module description.
[gnulib.git]
/
lib
/
stdlib.in.h
diff --git
a/lib/stdlib.in.h
b/lib/stdlib.in.h
index
c857de4
..
62a2ce9
100644
(file)
--- a/
lib/stdlib.in.h
+++ b/
lib/stdlib.in.h
@@
-28,13
+28,13
@@
#else
/* Normal invocation convention. */
#else
/* Normal invocation convention. */
-#ifndef _
GL
_STDLIB_H
+#ifndef _
@GUARD_PREFIX@
_STDLIB_H
/* The include_next requires a split double-inclusion guard. */
#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
/* The include_next requires a split double-inclusion guard. */
#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
-#ifndef _
GL
_STDLIB_H
-#define _
GL
_STDLIB_H
+#ifndef _
@GUARD_PREFIX@
_STDLIB_H
+#define _
@GUARD_PREFIX@
_STDLIB_H
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
@@
-81,8
+81,9
@@
struct random_data
# endif
#endif
# endif
#endif
-#if (@GNULIB_MKSTEMP@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if (@GNULIB_MKSTEMP@ || @GNULIB_
MKSTEMPS@ || @GNULIB_
GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */
/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */
+/* On MacOS X 10.5, only <unistd.h> declares mkstemps. */
/* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */
/* But avoid namespace pollution on glibc systems and native Windows. */
# include <unistd.h>
/* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */
/* But avoid namespace pollution on glibc systems and native Windows. */
# include <unistd.h>
@@
-259,25
+260,24
@@
_GL_WARN_ON_USE (ptsname, "grantpt is not portable - "
rely on GNU or POSIX semantics for malloc and realloc (for example,
by never specifying a zero size), so it does not need malloc or
realloc to be redefined. */
rely on GNU or POSIX semantics for malloc and realloc (for example,
by never specifying a zero size), so it does not need malloc or
realloc to be redefined. */
-#if
!_GL_USE_STDLIB_ALLOC
-# if @
GNULIB_MALLOC_POSIX
@
-# if
@REPLACE_MALLOC@
-
# if !(defined __cplusplus && defined GNULIB_NAMESPACE
)
-#
undef malloc
-#
define malloc rpl_malloc
-#
endif
+#if
@GNULIB_MALLOC_POSIX@
+# if @
REPLACE_MALLOC
@
+# if
!((defined __cplusplus && defined GNULIB_NAMESPACE) \
+
|| _GL_USE_STDLIB_ALLOC
)
+# undef malloc
+# define malloc rpl_malloc
+# endif
_GL_FUNCDECL_RPL (malloc, void *, (size_t size));
_GL_CXXALIAS_RPL (malloc, void *, (size_t size));
_GL_FUNCDECL_RPL (malloc, void *, (size_t size));
_GL_CXXALIAS_RPL (malloc, void *, (size_t size));
-#
else
+# else
_GL_CXXALIAS_SYS (malloc, void *, (size_t size));
_GL_CXXALIAS_SYS (malloc, void *, (size_t size));
-#
endif
+# endif
_GL_CXXALIASWARN (malloc);
_GL_CXXALIASWARN (malloc);
-#
elif defined GNULIB_POSIXCHECK
-#
undef malloc
+#
elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+# undef malloc
/* Assume malloc is always declared. */
_GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
"use gnulib module malloc-posix for portability");
/* Assume malloc is always declared. */
_GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
"use gnulib module malloc-posix for portability");
-# endif
#endif
/* Convert a multibyte character to a wide character. */
#endif
/* Convert a multibyte character to a wide character. */
@@
-535,25
+535,24
@@
_GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
#endif
#endif
-#if
!_GL_USE_STDLIB_ALLOC
-# if @
GNULIB_REALLOC_POSIX
@
-# if
@REPLACE_REALLOC@
-
# if !(defined __cplusplus && defined GNULIB_NAMESPACE
)
-#
undef realloc
-#
define realloc rpl_realloc
-#
endif
+#if
@GNULIB_REALLOC_POSIX@
+# if @
REPLACE_REALLOC
@
+# if
!((defined __cplusplus && defined GNULIB_NAMESPACE) \
+
|| _GL_USE_STDLIB_ALLOC
)
+# undef realloc
+# define realloc rpl_realloc
+# endif
_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size));
_GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size));
_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size));
_GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size));
-#
else
+# else
_GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
_GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
-#
endif
+# endif
_GL_CXXALIASWARN (realloc);
_GL_CXXALIASWARN (realloc);
-#
elif defined GNULIB_POSIXCHECK
-#
undef realloc
+#
elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
+# undef realloc
/* Assume realloc is always declared. */
_GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
"use gnulib module realloc-posix for portability");
/* Assume realloc is always declared. */
_GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
"use gnulib module realloc-posix for portability");
-# endif
#endif
#if @GNULIB_REALPATH@
#endif
#if @GNULIB_REALPATH@
@@
-762,6
+761,6
@@
_GL_CXXALIASWARN (wctomb);
#endif
#endif
-#endif /* _
GL
_STDLIB_H */
-#endif /* _
GL
_STDLIB_H */
+#endif /* _
@GUARD_PREFIX@
_STDLIB_H */
+#endif /* _
@GUARD_PREFIX@
_STDLIB_H */
#endif
#endif