merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 5bc501a54df7a7c59bc33a64224067628ffd434e..fd5a66f40c9fb32dfa68678b5c6b6f579a43b9a4 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-19  Rafael Avila de Espindola  <espindola@google.com>
+
+       PR40790
+       * plugin-api.h: Don't include stdint.h unconditionally.
+
 2009-10-15  Jakub Jelinek  <jakub@redhat.com>
 
        * include/dwarf2.h (DW_LANG_Python): Add comment that it is

diff --git a/include/plugin-api.h b/include/plugin-api.h
index a026e7a004bc71d0d25f526caeb14c360d700c42..572621fc374a3605cfc2591d570360f72295fb6d 100644 (file)
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -26,8 +26,16 @@
 #ifndef PLUGIN_API_H
 #define PLUGIN_API_H
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#endif
 #include <sys/types.h>
+#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && \
+    !defined(UINT64_MAX) && !defined(uint64_t)
+#error can not find uint64_t type
+#endif
 
 #ifdef __cplusplus
 extern "C"