[BACK]Return to stdbool.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srcm4

Diff for /embedaddon/libiconv/srcm4/stdbool.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:49 version 1.1.1.2, 2012/05/29 09:29:44
Line 1 Line 1
 # Check for stdbool.h that conforms to C99.  # Check for stdbool.h that conforms to C99.
   
dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
   
   #serial 5
   
 # Prepare for substituting <stdbool.h> if it is not supported.  # Prepare for substituting <stdbool.h> if it is not supported.
   
 AC_DEFUN([AM_STDBOOL_H],  AC_DEFUN([AM_STDBOOL_H],
 [  [
  AC_REQUIRE([AC_HEADER_STDBOOL])  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
   
   # Define two additional variables used in the Makefile substitution.    # Define two additional variables used in the Makefile substitution.
   
Line 19  AC_DEFUN([AM_STDBOOL_H], Line 21  AC_DEFUN([AM_STDBOOL_H],
     STDBOOL_H='stdbool.h'      STDBOOL_H='stdbool.h'
   fi    fi
   AC_SUBST([STDBOOL_H])    AC_SUBST([STDBOOL_H])
     AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
   
   if test "$ac_cv_type__Bool" = yes; then    if test "$ac_cv_type__Bool" = yes; then
     HAVE__BOOL=1      HAVE__BOOL=1
Line 31  AC_DEFUN([AM_STDBOOL_H], Line 34  AC_DEFUN([AM_STDBOOL_H],
 # AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.  # AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
 AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])  AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
   
# This macro is only needed in autoconf <= 2.59.  Newer versions of autoconf# This version of the macro is needed in autoconf <= 2.68.
# have this macro built-in. 
   
AC_DEFUN([AC_HEADER_STDBOOL],AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
   [AC_CACHE_CHECK([for stdbool.h that conforms to C99],    [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
      [ac_cv_header_stdbool_h],       [ac_cv_header_stdbool_h],
     [AC_TRY_COMPILE(     [AC_COMPILE_IFELSE(
        [        [AC_LANG_PROGRAM(
          #include <stdbool.h>           [[
          #ifndef bool             #include <stdbool.h>
           "error: bool is not defined"             #ifndef bool
          #endif              "error: bool is not defined"
          #ifndef false             #endif
           "error: false is not defined"             #ifndef false
          #endif              "error: false is not defined"
          #if false             #endif
           "error: false is not 0"             #if false
          #endif              "error: false is not 0"
          #ifndef true             #endif
           "error: true is not defined"             #ifndef true
          #endif              "error: true is not defined"
          #if true != 1             #endif
           "error: true is not 1"             #if true != 1
          #endif              "error: true is not 1"
          #ifndef __bool_true_false_are_defined             #endif
           "error: __bool_true_false_are_defined is not defined"             #ifndef __bool_true_false_are_defined
          #endif              "error: __bool_true_false_are_defined is not defined"
              #endif
   
          struct s { _Bool s: 1; _Bool t; } s;             struct s { _Bool s: 1; _Bool t; } s;
   
          char a[true == 1 ? 1 : -1];             char a[true == 1 ? 1 : -1];
          char b[false == 0 ? 1 : -1];             char b[false == 0 ? 1 : -1];
          char c[__bool_true_false_are_defined == 1 ? 1 : -1];             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
          char d[(bool) 0.5 == true ? 1 : -1];             char d[(bool) 0.5 == true ? 1 : -1];
          bool e = &s;             /* See body of main program for 'e'.  */
          char f[(_Bool) 0.0 == false ? 1 : -1];             char f[(_Bool) 0.0 == false ? 1 : -1];
          char g[true];             char g[true];
          char h[sizeof (_Bool)];             char h[sizeof (_Bool)];
          char i[sizeof s.t];             char i[sizeof s.t];
          enum { j = false, k = true, l = false * true, m = true * 256 };             enum { j = false, k = true, l = false * true, m = true * 256 };
          _Bool n[m];             /* The following fails for
          char o[sizeof n == m * sizeof n[0] ? 1 : -1];                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];             _Bool n[m];
          #if defined __xlc__ || defined __GNUC__             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
           /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
              reported by James Lemley on 2005-10-05; see             /* Catch a bug in an HP-UX C compiler.  See
              http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
              This test is not quite right, since xlc is allowed to                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
              reject this program, as the initializer for xlcbug is              */
              not one of the forms that C requires support for.             _Bool q = true;
              However, doing the test right would require a run-time             _Bool *pq = &q;
              test, and that would make cross-compilation harder.           ]],
              Let us hope that IBM fixes the xlc bug, and also adds           [[
              support for this kind of constant expression.  In the             bool e = &s;
              meantime, this test will reject xlc, which is OK, since             *pq |= q;
              our stdbool.h substitute should suffice.  We also test             *pq |= ! q;
              this with GCC, where it should work, to detect more             /* Refer to every declared value, to avoid compiler optimizations.  */
              quickly whether someone messes up the test in the             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
              future.  */                     + !m + !n + !o + !p + !q + !pq);
           char digs[] = "0123456789";           ]])],
           int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);        [ac_cv_header_stdbool_h=yes],
          #endif        [ac_cv_header_stdbool_h=no])])
          /* Catch a bug in an HP-UX C compiler.  See 
             http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html 
             http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html 
           */ 
          _Bool q = true; 
          _Bool *pq = &q; 
        ], 
        [ 
          *pq |= q; 
          *pq |= ! q; 
          /* Refer to every declared value, to avoid compiler optimizations.  */ 
          return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l 
                  + !m + !n + !o + !p + !q + !pq); 
        ], 
        [ac_cv_header_stdbool_h=yes], 
        [ac_cv_header_stdbool_h=no])]) 
    AC_CHECK_TYPES([_Bool])     AC_CHECK_TYPES([_Bool])
   if test $ac_cv_header_stdbool_h = yes; then])
     AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.]) 
   fi]) 
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>