summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-06-01 22:53:19 +0200
committerBruno Haible <bruno@clisp.org>2010-06-01 22:53:19 +0200
commitc8337fee8bd30207245f67201a9b4559f10ca91c (patch)
tree40ef11666214b2ca54cc01a50366c02435afb5b9
parent89bd4b68c1366a5e2e3ff7a89aad7d63e591a03a (diff)
downloadlibunistring-c8337fee8bd30207245f67201a9b4559f10ca91c.tar.gz
Avoid possible bad interaction with Solaris 2.5.1 <pthread.h>.
-rw-r--r--ChangeLog6
-rw-r--r--lib/stdint.mini.h3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73742af..8fc5418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-01 Bruno Haible <bruno@clisp.org>
+
+ Avoid possible bad interaction with Solaris 2.5.1 <pthread.h>.
+ * lib/stdint.mini.h (_UINT64_T): Don't define.
+ Reported by Ben Pfaff <blp@cs.stanford.edu>.
+
2010-05-16 Bruno Haible <bruno@clisp.org>
Update after gnulib changed.
diff --git a/lib/stdint.mini.h b/lib/stdint.mini.h
index d6f2cb0..111efbe 100644
--- a/lib/stdint.mini.h
+++ b/lib/stdint.mini.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
This file is part of gnulib.
@@ -121,7 +121,6 @@ typedef unsigned int unistring_uint32_t;
/* Avoid collision with Solaris 2.5.1 <pthread.h> etc. */
#define _UINT8_T
#define _UINT32_T
-#define _UINT64_T
#endif /* _UNISTRING_STDINT_H */