X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsize_max.m4;h=35bd3d6ae37ec6fe189a0122d73166943e3787cc;hb=68dfc9591e97db34b5ba693da028ff1f356a12b7;hp=a18caad53c43d3a982eb3a9bd9f6cf64fdc4f51a;hpb=79a8b1e309cf49624be02f65168d7bf7e3cb498c;p=gnulib.git

diff --git a/m4/size_max.m4 b/m4/size_max.m4
index a18caad53..35bd3d6ae 100644
--- 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.