bug-gnulib
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: gnulib breakage on Tru64 UNIX with commercial C compiler

From: Bruno Haible
Subject: Re: gnulib breakage on Tru64 UNIX with commercial C compiler
Date: Fri, 27 Apr 2007 13:08:21 +0200
User-agent: KMail/1.5.4 
On 2007-04-06 I wrote:
> 2007-04-06  Bruno Haible  <address@hidden>
> 
>       Fix problem with Compaq (ex-DEC) Desktop C compiler on Tru64.
>       * lib/math_.h [__DECC]: Include the overridden include file through
>       #include_next, outside the double-inclusion guard.
>       * 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.

This fixed gnulib with CC="cc", but broke it with CC="cc -nodtk", because
the latter does not support #include_next. This corrects it.

2007-04-27  Bruno Haible  <address@hidden>

        * 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.

*** lib/inttypes_.h     6 Apr 2007 12:53:53 -0000       1.9
--- lib/inttypes_.h     27 Apr 2007 10:28:33 -0000
***************
*** 21,27 ****
     which in turn includes this file.  */
  #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
  # if @HAVE_INTTYPES_H@
! #  ifdef __DECC
  #   include_next <inttypes.h>
  #  else
  #   include @ABSOLUTE_INTTYPES_H@
--- 21,27 ----
     which in turn includes this file.  */
  #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
  # if @HAVE_INTTYPES_H@
! #  if defined __DECC && __DECC_VER >= 60000000
  #   include_next <inttypes.h>
  #  else
  #   include @ABSOLUTE_INTTYPES_H@
*** lib/math_.h 6 Apr 2007 20:55:44 -0000       1.10
--- lib/math_.h 27 Apr 2007 10:28:33 -0000
***************
*** 16,29 ****
     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
  # include_next <math.h>
  #endif
  
  #ifndef _GL_MATH_H
  #define _GL_MATH_H
  
! #ifndef __DECC
  # include @ABSOLUTE_MATH_H@
  #endif
  
--- 16,29 ----
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
! #if defined __DECC && __DECC_VER >= 60000000
  # include_next <math.h>
  #endif
  
  #ifndef _GL_MATH_H
  #define _GL_MATH_H
  
! #if !(defined __DECC && __DECC_VER >= 60000000)
  # include @ABSOLUTE_MATH_H@
  #endif
  
*** lib/stdio_.h        26 Apr 2007 09:42:29 -0000      1.21
--- lib/stdio_.h        27 Apr 2007 10:28:33 -0000
***************
*** 24,37 ****
  #else
  /* Normal invocation convention.  */
  
! #ifdef __DECC
  # include_next <stdio.h>
  #endif
  
  #ifndef _GL_STDIO_H
  #define _GL_STDIO_H
  
! #ifndef __DECC
  # include @ABSOLUTE_STDIO_H@
  #endif
  
--- 24,37 ----
  #else
  /* Normal invocation convention.  */
  
! #if defined __DECC && __DECC_VER >= 60000000
  # include_next <stdio.h>
  #endif
  
  #ifndef _GL_STDIO_H
  #define _GL_STDIO_H
  
! #if !(defined __DECC && __DECC_VER >= 60000000)
  # include @ABSOLUTE_STDIO_H@
  #endif
  
*** lib/stdlib_.h       6 Apr 2007 12:25:54 -0000       1.8
--- lib/stdlib_.h       27 Apr 2007 10:28:33 -0000
***************
*** 31,37 ****
  #else
  /* Normal invocation convention.  */
  
! #ifdef __DECC
  # include_next <stdlib.h>
  #endif
  
--- 31,37 ----
  #else
  /* Normal invocation convention.  */
  
! #if defined __DECC && __DECC_VER >= 60000000
  # include_next <stdlib.h>
  #endif
  
***************
*** 45,51 ****
  # pragma GCC system_header
  #endif
  
! #ifndef __DECC
  # include @ABSOLUTE_STDLIB_H@
  #endif
  
--- 45,51 ----
  # pragma GCC system_header
  #endif
  
! #if !(defined __DECC && __DECC_VER >= 60000000)
  # include @ABSOLUTE_STDLIB_H@
  #endif
  
*** lib/string_.h       6 Apr 2007 12:25:54 -0000       1.30
--- lib/string_.h       27 Apr 2007 10:28:33 -0000
***************
*** 16,22 ****
     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
  # include_next <string.h>
  #endif
  
--- 16,22 ----
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
! #if defined __DECC && __DECC_VER >= 60000000
  # include_next <string.h>
  #endif
  
***************
*** 29,35 ****
  # pragma GCC system_header
  #endif
  
! #ifndef __DECC
  # include @ABSOLUTE_STRING_H@
  #endif
  
--- 29,35 ----
  # pragma GCC system_header
  #endif
  
! #if !(defined __DECC && __DECC_VER >= 60000000)
  # include @ABSOLUTE_STRING_H@
  #endif
  
*** lib/time_.h 6 Apr 2007 12:25:54 -0000       1.3
--- lib/time_.h 27 Apr 2007 10:28:33 -0000
***************
*** 25,38 ****
  #else
  /* Normal invocation convention.  */
  
! # ifdef __DECC
  #  include_next <time.h>
  # endif
  
  # if ! defined _GL_TIME_H
  #  define _GL_TIME_H
  
! #  ifndef __DECC
  #   include @ABSOLUTE_TIME_H@
  #  endif
  
--- 25,38 ----
  #else
  /* Normal invocation convention.  */
  
! # if defined __DECC && __DECC_VER >= 60000000
  #  include_next <time.h>
  # endif
  
  # if ! defined _GL_TIME_H
  #  define _GL_TIME_H
  
! #  if !(defined __DECC && __DECC_VER >= 60000000)
  #   include @ABSOLUTE_TIME_H@
  #  endif
  
*** lib/wchar_.h        6 Apr 2007 12:25:54 -0000       1.2
--- lib/wchar_.h        27 Apr 2007 10:28:33 -0000
***************
*** 25,31 ****
   * For now, this just ensures proper prerequisite inclusion order.
   */
  
! #ifdef __DECC
  # include <stdio.h>
  # include_next <wchar.h>
  #endif
--- 25,31 ----
   * For now, this just ensures proper prerequisite inclusion order.
   */
  
! #if defined __DECC && __DECC_VER >= 60000000
  # include <stdio.h>
  # include_next <wchar.h>
  #endif
***************
*** 42,48 ****
  #include <time.h>
  
  /* Include the original <wchar.h>.  */
! #ifndef __DECC
  # include @ABSOLUTE_WCHAR_H@
  #endif
  
--- 42,48 ----
  #include <time.h>
  
  /* Include the original <wchar.h>.  */
! #if !(defined __DECC && __DECC_VER >= 60000000)
  # include @ABSOLUTE_WCHAR_H@
  #endif
  
*** lib/wctype_.h       6 Apr 2007 12:25:54 -0000       1.9
--- lib/wctype_.h       27 Apr 2007 10:28:33 -0000
***************
*** 39,45 ****
  #endif
  
  #if @HAVE_WCTYPE_H@
! # ifdef __DECC
  #  include_next <wctype.h>
  # endif
  #endif
--- 39,45 ----
  #endif
  
  #if @HAVE_WCTYPE_H@
! # if defined __DECC && __DECC_VER >= 60000000
  #  include_next <wctype.h>
  # endif
  #endif
***************
*** 50,56 ****
  /* Include the original <wctype.h> if it exists.
     BeOS 5 has the functions but no <wctype.h>.  */
  #if @HAVE_WCTYPE_H@
! # ifndef __DECC
  #  include @ABSOLUTE_WCTYPE_H@
  # endif
  #endif
--- 50,56 ----
  /* Include the original <wctype.h> if it exists.
     BeOS 5 has the functions but no <wctype.h>.  */
  #if @HAVE_WCTYPE_H@
! # if !(defined __DECC && __DECC_VER >= 60000000)
  #  include @ABSOLUTE_WCTYPE_H@
  # endif
  #endif
reply via email to
[Prev in Thread] Current Thread [Next in Thread]