aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-10-19 18:14:24 +0000
committerDJ Delorie <dj@redhat.com>2009-10-19 18:14:24 +0000
commit0adbbe4a718206c36143d4d3d756e5246e087a0f (patch)
treea3dd071aa1831a86c16c9145f377071384757441
parentadc427c7861a5a19b16e955cfa02bf4a728e0b84 (diff)
downloadbinutils-0adbbe4a718206c36143d4d3d756e5246e087a0f.zip
binutils-0adbbe4a718206c36143d4d3d756e5246e087a0f.tar.gz
binutils-0adbbe4a718206c36143d4d3d756e5246e087a0f.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog5
-rw-r--r--include/plugin-api.h8
2 files changed, 13 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 5bc501a..fd5a66f 100644
--- 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 a026e7a..572621f 100644
--- 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"