Mercurial > hg > octave-kai > gnulib-hg
changeset 9039:c2aa15b918a5
Ensure that <stdint.h> defines all the *_MAX and *_MIN macros that gnulib's
inttypes.h requires.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 02 Jul 2007 23:28:02 +0000 |
| parents | 67d6e62c3540 |
| children | 45826531b132 |
| files | ChangeLog m4/inttypes.m4 |
| diffstat | 2 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-02 Bruno Haible <bruno@clisp.org> + + * m4/inttypes.m4 (gl_INTTYPES_H): Define __STDC_LIMIT_MACROS in C++ + mode, when inttypes.h comes from gnulib. + Reported by Joel E. Denny <jdenny@ces.clemson.edu>. + 2007-07-02 Simon Josefsson <simon@josefsson.org> * NEWS: Mention lgpl module name change.
--- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,4 +1,4 @@ -# inttypes.m4 serial 9 +# inttypes.m4 serial 10 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, @@ -144,6 +144,22 @@ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([inttypes.h]) + dnl Ensure that <stdint.h> defines the limit macros, since gnulib's + dnl <inttypes.h> relies on them. This macro is only needed when a + dnl C++ compiler is in use; it has no effect for a C compiler. + 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, + [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 +# define __STDC_LIMIT_MACROS 1 +#endif +]) + PRIPTR_PREFIX= if test -n "$STDINT_H"; then dnl Using the gnulib <stdint.h>. It always defines intptr_t to 'long'.