Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6872:ed4106144765
Resolve clash between stdint.m4 and uintmax_t.m4.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 27 Jun 2006 13:15:26 +0000 |
parents | 3f3ba5c21147 |
children | 19d1a55a5de8 |
files | lib/ChangeLog lib/stdint_.h |
diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-06-27 Bruno Haible <bruno@clisp.org> + + * stdlib_.h (intmax_t, uintmax_t): Undefine before typedef. + 2006-06-26 Paul Eggert <eggert@cs.ucla.edu> * base64.c (B64): Use _ as the formal parameter, not x, to avoid
--- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -261,6 +261,8 @@ public header files. */ #if !@HAVE_INTMAX_T@ +/* Remove possible redundant definition from gnulib's config.h first. */ +# undef intmax_t # ifdef _STDINT_H_HAVE_INT64 typedef int64_t intmax_t; # else @@ -268,6 +270,8 @@ # endif #endif #if !@HAVE_UINTMAX_T@ +/* Remove possible redundant definition from gnulib's config.h first. */ +# undef uintmax_t # ifdef _STDINT_H_HAVE_UINT64 typedef uint64_t uintmax_t; # else