From 495939e0b41958931ba240a4fa0f5f2ea4af525f Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 27 Apr 2007 11:09:11 +0000
Subject: [PATCH] OSF/1 "cc -nodtk" does not support #include_next.
---
ChangeLog | 12 ++++++++++++
lib/inttypes_.h | 2 +-
lib/math_.h | 4 ++--
lib/stdio_.h | 4 ++--
lib/stdlib_.h | 4 ++--
lib/string_.h | 4 ++--
lib/time_.h | 4 ++--
lib/wchar_.h | 4 ++--
lib/wctype_.h | 4 ++--
9 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index db350c7e77..6b3e691102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-04-27 Bruno Haible <bruno@clisp.org>
+
+ * lib/inttypes_.h [_DECC]: Don't use #include_next if the compiler
+ version is < 6.
+ * lib/math_.h [__DECC]: Likewise.
+ * lib/stdio_.h [__DECC]: Likewise.
+ * lib/stdlib_.h [__DECC]: Likewise.
+ * lib/string_.h [__DECC]: Likewise.
+ * lib/time_.h [__DECC]: Likewise.
+ * lib/wchar_.h [__DECC]: Likewise.
+ * lib/wctype_.h [__DECC]: Likewise.
+
2007-04-27 Bruno Haible <bruno@clisp.org>
* tests/test-fbufmode.c (main): Relax test, to avoid failure on mingw.
diff --git a/lib/inttypes_.h b/lib/inttypes_.h
index d2af35e677..fcf95b053c 100644
--- a/lib/inttypes_.h
+++ b/lib/inttypes_.h
@@ -21,7 +21,7 @@
which in turn includes this file. */
#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
# if @HAVE_INTTYPES_H@
-# ifdef __DECC
+# if defined __DECC && __DECC_VER >= 60000000
# include_next <inttypes.h>
# else
# include @ABSOLUTE_INTTYPES_H@
diff --git a/lib/math_.h b/lib/math_.h
index 9e84d06aae..588642c1f3 100644
--- a/lib/math_.h
+++ b/lib/math_.h
@@ -16,14 +16,14 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef __DECC
+#if defined __DECC && __DECC_VER >= 60000000
# include_next <math.h>
#endif
#ifndef _GL_MATH_H
#define _GL_MATH_H
-#ifndef __DECC
+#if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_MATH_H@
#endif
diff --git a/lib/stdio_.h b/lib/stdio_.h
index 8371df47af..0e35ffd037 100644
--- a/lib/stdio_.h
+++ b/lib/stdio_.h
@@ -24,14 +24,14 @@
#else
/* Normal invocation convention. */
-#ifdef __DECC
+#if defined __DECC && __DECC_VER >= 60000000
# include_next <stdio.h>
#endif
#ifndef _GL_STDIO_H
#define _GL_STDIO_H
-#ifndef __DECC
+#if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_STDIO_H@
#endif
diff --git a/lib/stdlib_.h b/lib/stdlib_.h
index 0581509adc..c947c1d263 100644
--- a/lib/stdlib_.h
+++ b/lib/stdlib_.h
@@ -31,7 +31,7 @@
#else
/* Normal invocation convention. */
-#ifdef __DECC
+#if defined __DECC && __DECC_VER >= 60000000
# include_next <stdlib.h>
#endif
@@ -45,7 +45,7 @@
# pragma GCC system_header
#endif
-#ifndef __DECC
+#if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_STDLIB_H@
#endif
diff --git a/lib/string_.h b/lib/string_.h
index a7c0c23f4a..95888635c2 100644
--- a/lib/string_.h
+++ b/lib/string_.h
@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef __DECC
+#if defined __DECC && __DECC_VER >= 60000000
# include_next <string.h>
#endif
@@ -29,7 +29,7 @@
# pragma GCC system_header
#endif
-#ifndef __DECC
+#if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_STRING_H@
#endif
diff --git a/lib/time_.h b/lib/time_.h
index 28fb04ddbf..49c668f10b 100644
--- a/lib/time_.h
+++ b/lib/time_.h
@@ -25,14 +25,14 @@
#else
/* Normal invocation convention. */
-# ifdef __DECC
+# if defined __DECC && __DECC_VER >= 60000000
# include_next <time.h>
# endif
# if ! defined _GL_TIME_H
# define _GL_TIME_H
-# ifndef __DECC
+# if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_TIME_H@
# endif
diff --git a/lib/wchar_.h b/lib/wchar_.h
index 5f87be7aa3..7a93d07e61 100644
--- a/lib/wchar_.h
+++ b/lib/wchar_.h
@@ -25,7 +25,7 @@
* For now, this just ensures proper prerequisite inclusion order.
*/
-#ifdef __DECC
+#if defined __DECC && __DECC_VER >= 60000000
# include <stdio.h>
# include_next <wchar.h>
#endif
@@ -42,7 +42,7 @@
#include <time.h>
/* Include the original <wchar.h>. */
-#ifndef __DECC
+#if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_WCHAR_H@
#endif
diff --git a/lib/wctype_.h b/lib/wctype_.h
index f9028e4d03..460cee2bc6 100644
--- a/lib/wctype_.h
+++ b/lib/wctype_.h
@@ -39,7 +39,7 @@
#endif
#if @HAVE_WCTYPE_H@
-# ifdef __DECC
+# if defined __DECC && __DECC_VER >= 60000000
# include_next <wctype.h>
# endif
#endif
@@ -50,7 +50,7 @@
/* Include the original <wctype.h> if it exists.
BeOS 5 has the functions but no <wctype.h>. */
#if @HAVE_WCTYPE_H@
-# ifndef __DECC
+# if !(defined __DECC && __DECC_VER >= 60000000)
# include @ABSOLUTE_WCTYPE_H@
# endif
#endif
--
2.30.2