Sync from gnulib.

diff --git a/m4/uint32_t.m4 b/m4/uint32_t.m4
index cfa5150349996af7c3f8031380e3cce0ae911bbd..8a3f16de2926d191ffa1e7e9f851bffd1611606a 100644 (file)
--- a/m4/uint32_t.m4
+++ b/m4/uint32_t.m4
@@ -1,4 +1,4 @@
-# uint32_t.m4 serial 2
+# uint32_t.m4 serial 3
 
 # Copyright (C) 2004 Free Software Foundation, Inc.
 
@@ -27,13 +27,17 @@ AC_DEFUN([gl_AC_TYPE_UINT32_T],
        AC_COMPILE_IFELSE(
         [AC_LANG_BOOL_COMPILE_TRY(
            [AC_INCLUDES_DEFAULT],
-           [[(uint32_t) -1 == 4294967295U]])],
+           [[($ac_type) -1 == 4294967295U]])],
         [gl_cv_c_uint32_t=$ac_type])
-       test $gl_cv_c_uint32_t != no && break
+       test "$gl_cv_c_uint32_t" != no && break
      done])
-  case $gl_cv_c_uint32_t in
+  case "$gl_cv_c_uint32_t" in
   no|uint32_t) ;;
   *)
+    AC_DEFINE(_UINT32_T, 1,
+      [Define for Solaris 2.5.1 so uint32_t typedef from <sys/synch.h>,
+       <pthread.h>, or <semaphore.h> is not used. If the typedef was
+       allowed, the #define below would cause a syntax error.])
     AC_DEFINE_UNQUOTED(uint32_t, $gl_cv_c_uint32_t,
       [Define to the type of a unsigned integer type of width exactly 32 bits
        if such a type exists and the standard includes do not define it.])