Mercurial > hg > octave-nkf > gnulib-hg
changeset 8728:57a6a395deae
OSF/1 "cc -nodtk" does not support #include_next.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Fri, 27 Apr 2007 11:09:11 +0000 |
parents | 31b6747645f9 |
children | 9901a6759c3a |
files | ChangeLog lib/inttypes_.h lib/math_.h lib/stdio_.h lib/stdlib_.h lib/string_.h lib/time_.h lib/wchar_.h lib/wctype_.h |
diffstat | 9 files changed, 27 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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@
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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