projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd39f4a
)
Resolve clash between stdint.m4 and uintmax_t.m4.
author
Bruno Haible
<bruno@clisp.org>
Tue, 27 Jun 2006 13:15:26 +0000
(13:15 +0000)
committer
Bruno Haible
<bruno@clisp.org>
Tue, 27 Jun 2006 13:15:26 +0000
(13:15 +0000)
lib/ChangeLog
patch
|
blob
|
history
lib/stdint_.h
patch
|
blob
|
history
diff --git
a/lib/ChangeLog
b/lib/ChangeLog
index
9870838
..
6aac72e
100644
(file)
--- 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
2006-06-26 Paul Eggert <eggert@cs.ucla.edu>
* base64.c (B64): Use _ as the formal parameter, not x, to avoid
diff --git
a/lib/stdint_.h
b/lib/stdint_.h
index
3afdfae
..
9e0faab
100644
(file)
--- a/
lib/stdint_.h
+++ b/
lib/stdint_.h
@@
-261,6
+261,8
@@
typedef unsigned long uintptr_t;
public header files. */
#if !@HAVE_INTMAX_T@
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
# ifdef _STDINT_H_HAVE_INT64
typedef int64_t intmax_t;
# else
@@
-268,6
+270,8
@@
typedef int32_t intmax_t;
# endif
#endif
#if !@HAVE_UINTMAX_T@
# 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
# ifdef _STDINT_H_HAVE_UINT64
typedef uint64_t uintmax_t;
# else