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

[pspp] / lib / inttypes_.h

diff --git a/lib/inttypes_.h b/lib/inttypes_.h
index fcf95b053c41e35a57868474bd219dbfbb52ed0a..5257275fd1412991dffc483a049238c6bbc889d2 100644 (file)
--- a/lib/inttypes_.h
+++ b/lib/inttypes_.h
@@ -16,27 +16,24 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+/*
+ * ISO C 99 <inttypes.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/inttypes.h.html>
+ */
+
 /* Include the original <inttypes.h> if it exists, and if this file
    has not been included yet or if this file includes gnulib stdint.h
-   which in turn includes this file.  */
-#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
+   which in turn includes this file.
+   The include_next requires a split double-inclusion guard.  */
+#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 # if @HAVE_INTTYPES_H@
-#  if defined __DECC && __DECC_VER >= 60000000
-#   include_next <inttypes.h>
-#  else
-#   include @ABSOLUTE_INTTYPES_H@
-#  endif
+#  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
 # endif
 #endif
 
-#if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
+#if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 #define INTTYPES_H
 
-/*
- * ISO C 99 <inttypes.h> for platforms that lack it.
- * <http://www.opengroup.org/susv3xbd/inttypes.h.html>
- */
-
 /* Include <stdint.h> or the gnulib replacement.  */
 #include <stdint.h>
 /* Get CHAR_BIT.  */
@@ -1096,4 +1093,4 @@ extern uintmax_t strtoumax (const char *, char **, int);
 }
 #endif
 
-#endif /* INTTYPES_H */
+#endif /* !defined INTTYPES_H && !defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H */