From ece07ae56d788e06a1b6e2a4d6033269ec65bfe2 Mon Sep 17 00:00:00 2001 From: brobecke Date: Sun, 14 Sep 2008 06:37:18 +0000 Subject: [PATCH] * defs.h (GCC_GENERATED_STDINT_H): Define. --- gdb/ChangeLog | 4 ++++ gdb/defs.h | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 897c3acf14..865b52393f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2008-09-13 Joel Brobecker + + * defs.h (GCC_GENERATED_STDINT_H): Define. + 2008-09-13 Tom Tromey * varobj.c (varobj_set_display_format): Use xfree. diff --git a/gdb/defs.h b/gdb/defs.h index b0d18d2cd3..23a65994d3 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -30,6 +30,20 @@ #include #include +/* The libdecnumber library, on which GDB depends, includes a header file + called gstdint.h instead of relying directly on stdint.h. GDB, on the + other hand, includes stdint.h directly, relying on the fact that gnulib + generates a copy if the system doesn't provide one or if it is missing + some features. Unfortunately, gstdint.h and stdint.h cannot be included + at the same time, which may happen when we include a file from + libdecnumber. + + The following macro definition effectively prevents the inclusion of + gstdint.h, as all the definitions it provides are guarded against + the GCC_GENERATED_STDINT_H macro. We already have gnulib/stdint.h + included, so it's ok to blank out gstdint.h. */ +#define GCC_GENERATED_STDINT_H 1 + #ifdef HAVE_STDDEF_H #include #endif -- 2.11.0