diff options
| author | DJ Delorie <dj@redhat.com> | 2009-10-19 22:14:24 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2009-10-19 22:14:24 +0400 |
| commit | 9d52f5c21cfc39edba3f0b4ba841710838bb913e (patch) | |
| tree | 95c6f4e2cd059771e7b0ac91dca20b282d188098 | |
| parent | b3f5fb37182a05a65f36256f79563e087fc4975d (diff) | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/plugin-api.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 5bc501a54..fd5a66f40 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 a026e7a00..572621fc3 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" |