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

[pspp] / lib / stdlib_.h

diff --git a/lib/stdlib_.h b/lib/stdlib_.h
index 425961edda799e404f5c952d96ce966135d02ea9..d1e254ab769c33c4523d80c2c41bfc6e9c813f3e 100644 (file)
--- a/lib/stdlib_.h
+++ b/lib/stdlib_.h
@@ -19,35 +19,18 @@
 #if defined __need_malloc_and_calloc
 /* Special invocation convention inside glibc header files.  */
 
-/* This #pragma avoids a warning with "gcc -Wall" on some glibc systems
-   on which <stdlib.h> has an inappropriate declaration, see
-   <http://sourceware.org/bugzilla/show_bug.cgi?id=1079>.  */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
-
-#include @ABSOLUTE_STDLIB_H@
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
 #else
 /* Normal invocation convention.  */
 
-#if defined __DECC && __DECC_VER >= 60000000
-# include_next <stdlib.h>
-#endif
-
 #ifndef _GL_STDLIB_H
-#define _GL_STDLIB_H
 
-/* This #pragma avoids a warning with "gcc -Wall" on some glibc systems
-   on which <stdlib.h> has an inappropriate declaration, see
-   <http://sourceware.org/bugzilla/show_bug.cgi?id=1079>.  */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
-#if !(defined __DECC && __DECC_VER >= 60000000)
-# include @ABSOLUTE_STDLIB_H@
-#endif
+#ifndef _GL_STDLIB_H
+#define _GL_STDLIB_H
 
 
 /* The definition of GL_LINK_WARNING is copied here.  */
@@ -144,5 +127,6 @@ extern int mkstemp (char * /*template*/);
 }
 #endif
 
+#endif /* _GL_STDLIB_H */
 #endif /* _GL_STDLIB_H */
 #endif