From a29314f1739b34cb7653f4140c7cff368de86ead Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 7 Aug 2007 22:26:23 +0000 Subject: [PATCH] Avoid gcc warning: "__STDC_LIMIT_MACROS_TRIGGER" redefined --- ChangeLog | 7 +++++++ m4/inttypes.m4 | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 431dd2c7d3..0fb640e03b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-07 Bruno Haible + + * 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 * modules/crypto/arctwo (License): Use the synonymous term "LGPLv2+". diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index a944659e35..8f949d092f 100644 --- 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 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 visible.]) AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ], [/* Ensure that defines the limit macros, since gnulib's 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 ]) -- 2.30.2