* m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST

[gnulib.git] / lib / stdlib_.h

diff --git a/lib/stdlib_.h b/lib/stdlib_.h
index 5a23da1..d1e254a 100644 (file)
--- a/lib/stdlib_.h
+++ b/lib/stdlib_.h
@@ -18,13 +18,19 @@
 
 #if defined __need_malloc_and_calloc
 /* Special invocation convention inside glibc header files.  */
-#include @ABSOLUTE_STDLIB_H@
+
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
+
 #else
 /* Normal invocation convention.  */
+
 #ifndef _GL_STDLIB_H
-#define _GL_STDLIB_H
 
-#include @ABSOLUTE_STDLIB_H@
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
+
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
 
 
 /* The definition of GL_LINK_WARNING is copied here.  */
@@ -34,8 +40,13 @@
 #ifndef EXIT_SUCCESS
 # define EXIT_SUCCESS 0
 #endif
+/* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
+   with proper operation of xargs.  */
 #ifndef EXIT_FAILURE
 # define EXIT_FAILURE 1
+#elif EXIT_FAILURE != 1
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
 #endif
 
 
@@ -44,6 +55,30 @@ extern "C" {
 #endif
 
 
+#if @GNULIB_GETSUBOPT@
+/* Assuming *OPTIONP is a comma separated list of elements of the form
+   "token" or "token=value", getsubopt parses the first of these elements.
+   If the first element refers to a "token" that is member of the given
+   NULL-terminated array of tokens:
+     - It replaces the comma with a NUL byte, updates *OPTIONP to point past
+       the first option and the comma, sets *VALUEP to the value of the
+       element (or NULL if it doesn't contain an "=" sign),
+     - It returns the index of the "token" in the given array of tokens.
+   Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
+   For more details see the POSIX:2001 specification.
+   http://www.opengroup.org/susv3xsh/getsubopt.html */
+# if !@HAVE_GETSUBOPT@
+extern int getsubopt (char **optionp, char *const *tokens, char **valuep);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getsubopt
+# define getsubopt(o,t,v) \
+    (GL_LINK_WARNING ("getsubopt is unportable - " \
+                      "use gnulib module getsubopt for portability"), \
+     getsubopt (o, t, v))
+#endif
+
+
 #if @GNULIB_MKDTEMP@
 # if !@HAVE_MKDTEMP@
 /* Create a unique temporary directory from TEMPLATE.
@@ -51,16 +86,17 @@ extern "C" {
    they are replaced with a string that makes the directory name unique.
    Returns TEMPLATE, or a null pointer if it cannot get a unique name.
    The directory is created mode 700.  */
-extern char * mkdtemp (char *template);
+extern char * mkdtemp (char * /*template*/);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkdtemp
 # define mkdtemp(t) \
-    (GL_LINK_WARNING ("mkdtemp is unportable - "\
+    (GL_LINK_WARNING ("mkdtemp is unportable - " \
                       "use gnulib module mkdtemp for portability"), \
      mkdtemp (t))
 #endif
 
+
 #if @GNULIB_MKSTEMP@
 # if @REPLACE_MKSTEMP@
 /* Create a unique temporary file from TEMPLATE.
@@ -73,12 +109,15 @@ extern char * mkdtemp (char *template);
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
 #  define mkstemp rpl_mkstemp
-extern int mkstemp (char *template);
+extern int mkstemp (char * /*template*/);
+# else
+/* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
+#  include <unistd.h>
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkstemp
 # define mkstemp(t) \
-    (GL_LINK_WARNING ("mkstemp is unportable - "\
+    (GL_LINK_WARNING ("mkstemp is unportable - " \
                       "use gnulib module mkstemp for portability"), \
      mkstemp (t))
 #endif
@@ -89,4 +128,5 @@ extern int mkstemp (char *template);
 #endif
 
 #endif /* _GL_STDLIB_H */
+#endif /* _GL_STDLIB_H */
 #endif