X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fuint32_t.m4;h=1fb5e668fc3830f92c5c4f2a61eb335ef0804f44;hb=cac6368e434325b8170f0f695021078c80c4b032;hp=cfa5150349996af7c3f8031380e3cce0ae911bbd;hpb=4773da75a82e9a229424cc75f4f1d391bb2ce4e8;p=gnulib.git

diff --git a/m4/uint32_t.m4 b/m4/uint32_t.m4
index cfa515034..1fb5e668f 100644
--- a/m4/uint32_t.m4
+++ b/m4/uint32_t.m4
@@ -1,20 +1,9 @@
-# uint32_t.m4 serial 2
+# uint32_t.m4 serial 4
 
 # Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # Written by Paul Eggert.
 
@@ -27,13 +16,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.])