X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstdint.m4;h=1a4b4a6a36a3026fcc80917f8647d8c038384872;hb=018d784ec357cbce8d1eae53e26c05b8964d3f7b;hp=6fa651845b890c661d73091791a9b69c780d6fcc;hpb=ff20a14ee1bda1e9efe63ab16427de81f25c29d4;p=gnulib.git

diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 6fa651845..1a4b4a6a3 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 20
-dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc.
+# stdint.m4 serial 22
+dnl Copyright (C) 2001-2002, 2004-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -27,15 +27,6 @@ AC_DEFUN([gl_STDINT_H],
   fi
   AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
 
-  dnl Check for <wchar.h>.
-  AC_CHECK_HEADERS_ONCE([wchar.h])
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
-  AC_SUBST([HAVE_WCHAR_H])
-
   dnl Check for <inttypes.h>.
   dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
   if test $ac_cv_header_inttypes_h = yes; then
@@ -75,7 +66,7 @@ AC_DEFUN([gl_STDINT_H],
       [gl_cv_header_working_stdint_h],
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
-	 AC_LANG_PROGRAM([[
+         AC_LANG_PROGRAM([[
 #include <stddef.h>
 #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
 #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
@@ -160,9 +151,9 @@ struct s {
 
   /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
   int check_UINT8_C:
-	(-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
   int check_UINT16_C:
-	(-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
 
   /* Detect bugs in OpenBSD 3.9 stdint.h.  */
 #ifdef UINT8_MAX
@@ -189,11 +180,12 @@ struct s {
   int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
   int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
 };
-	 ]])],
+         ]])],
          [gl_cv_header_working_stdint_h=yes])])
   fi
-  if test "$gl_cv_header_working_stdint_h" != yes; then
-
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
     dnl Check for <sys/inttypes.h>, and for
     dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
     AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
@@ -230,7 +222,7 @@ AC_DEFUN([gl_STDINT_BITSIZEOF],
   for gltype in $1 ; do
     AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
       [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
-	 [$2
+         [$2
 #include <limits.h>], [result=unknown])
        eval gl_cv_bitsizeof_${gltype}=\$result
       ])
@@ -298,35 +290,35 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
   AC_FOREACH([gltype], [$1],
     [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
        [Define to l, ll, u, ul, ull, etc., as suitable for
-	constants of type ']gltype['.])])
+        constants of type ']gltype['.])])
   for gltype in $1 ; do
     AC_CACHE_CHECK([for $gltype integer literal suffix],
       [gl_cv_type_${gltype}_suffix],
       [eval gl_cv_type_${gltype}_suffix=no
        eval result=\$gl_cv_type_${gltype}_signed
        if test "$result" = yes; then
-	 glsufu=
+         glsufu=
        else
-	 glsufu=u
+         glsufu=u
        fi
        for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-	 case $glsuf in
-	   '')  gltype1='int';;
-	   l)	gltype1='long int';;
-	   ll)	gltype1='long long int';;
-	   i64)	gltype1='__int64';;
-	   u)	gltype1='unsigned int';;
-	   ul)	gltype1='unsigned long int';;
-	   ull)	gltype1='unsigned long long int';;
-	   ui64)gltype1='unsigned __int64';;
-	 esac
-	 AC_COMPILE_IFELSE(
-	   [AC_LANG_PROGRAM([$2
-	      extern $gltype foo;
-	      extern $gltype1 foo;])],
-	   [eval gl_cv_type_${gltype}_suffix=\$glsuf])
-	 eval result=\$gl_cv_type_${gltype}_suffix
-	 test "$result" != no && break
+         case $glsuf in
+           '')  gltype1='int';;
+           l)	gltype1='long int';;
+           ll)	gltype1='long long int';;
+           i64)	gltype1='__int64';;
+           u)	gltype1='unsigned int';;
+           ul)	gltype1='unsigned long int';;
+           ull)	gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([$2
+              extern $gltype foo;
+              extern $gltype1 foo;])],
+           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
        done])
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
@@ -341,15 +333,13 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
 dnl gl_STDINT_INCLUDES
 AC_DEFUN([gl_STDINT_INCLUDES],
 [[
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
   #include <stddef.h>
   #include <signal.h>
-  #if HAVE_WCHAR_H
-    /* BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
-       <wchar.h>.  */
-  # include <stdio.h>
-  # include <time.h>
-  # include <wchar.h>
-  #endif
+  #include <stdio.h>
+  #include <time.h>
+  #include <wchar.h>
 ]])
 
 dnl gl_STDINT_TYPE_PROPERTIES
@@ -372,3 +362,8 @@ dnl Remove this when we can assume autoconf >= 2.61.
 m4_ifdef([AC_COMPUTE_INT], [], [
   AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
 ])
+
+# Hey Emacs!
+# Local Variables:
+# indent-tabs-mode: nil
+# End: