Avoid redefinition warnings for SIZE_MAX.

diff --git a/ChangeLog b/ChangeLog
index 574451033d7b950fb9084f59be647835c2aa9267..89a4882ad8b302f432a2956933cae1769f6e199f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Bruno Haible  <bruno@clisp.org>
+
+       Avoid redefinition warnings for SIZE_MAX.
+       * m4/size_max.m4 (gl_SIZE_MAX): Avoid redefining SIZE_MAX in config.h.
+       Reported by Simon Josefsson.
+
 2009-05-21  Bruno Haible  <bruno@clisp.org>
 
        * m4/size_max.m4 (gl_SIZE_MAX): Use AC_CACHE_CHECK instead of

diff --git a/m4/size_max.m4 b/m4/size_max.m4
index a18caad53c43d3a982eb3a9bd9f6cf64fdc4f51a..35bd3d6ae37ec6fe189a0122d73166943e3787cc 100644 (file)
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,4 +1,4 @@
-# size_max.m4 serial 8
+# size_max.m4 serial 9
 dnl Copyright (C) 2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -57,6 +57,15 @@ Found it
     AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
       [Define as the maximum value of type 'size_t', if the system doesn't define it.])
   fi
+  dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
+  dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
+  dnl #define by AC_DEFINE_UNQUOTED.
+  AH_VERBATIM([SIZE_MAX],
+[/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+#ifndef SIZE_MAX
+# undef SIZE_MAX
+#endif])
 ])
 
 dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.