merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c36413bbbfbd28eaaef767313507e770dbe1c5b8..c86cbc6075a076376b9ccdede49650f2215d0854 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * hashtab.c [HAVE_INTTYPES_H]: Include <inttypes.h>.
+
 2009-09-15  Tristan Gingold  <gingold@adacore.com>
 
        * config.h-vms (intptr_t): Define to compile hashtab.c

diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c
index 8c8bd3110ade2a1d509321a46341baa52a3f8131..8c89bfcd8393e8fde1e6b38847bd85f618c5ae25 100644 (file)
--- a/libiberty/hashtab.c
+++ b/libiberty/hashtab.c
@@ -50,6 +50,9 @@ Boston, MA 02110-1301, USA.  */
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif