Avoid gcc warning: "__STDC_LIMIT_MACROS_TRIGGER" redefined

diff --git a/ChangeLog b/ChangeLog
index 431dd2c7d35669a3651f3512daec91405f05c047..0fb640e03b9ff17c39000c7f24d39d7f1519a8db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-07  Bruno Haible  <bruno@clisp.org>
+
+       * m4/inttypes.m4 (gl_INTTYPES_H): Use GL_TRIGGER_STDC_LIMIT_MACROS
+       instead of __STDC_LIMIT_MACROS_TRIGGER. This avoids a redefinition
+       warning from gcc.
+       Reported by Eric Blake.
+
 2007-08-07  Simon Josefsson  <simon@josefsson.org>
 
        * modules/crypto/arctwo (License): Use the synonymous term "LGPLv2+".

diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index a944659e3577b66ab5eb435e845b07c9c3c62453..8f949d092fda331d287775a5bec85eebaf7c4d41 100644 (file)
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 10
+# inttypes.m4 serial 11
 dnl Copyright (C) 2006-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,
@@ -150,12 +150,12 @@ const char *l = /* implicit string concatenation */
     dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's
     dnl <inttypes.h> is going to be created, and to avoid redefinition warnings
     dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS.
-    AC_DEFINE([__STDC_LIMIT_MACROS_TRIGGER], 1,
+    AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], 1,
       [Define to make the limit macros in <stdint.h> visible.])
     AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ],
 [/* Ensure that <stdint.h> defines the limit macros, since gnulib's
    <inttypes.h> relies on them.  */
-#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && __STDC_LIMIT_MACROS_TRIGGER
+#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
 # define __STDC_LIMIT_MACROS 1
 #endif
 ])