aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2002-02-07 22:28:31 +0000
committerDaniel Jacobowitz <drow@false.org>2002-02-07 22:28:31 +0000
commite108f470528369ba8b8d4a2899f0a740d034f33e (patch)
treeac4edbcebaa3ed9f84192ffae8f233ae7796ee17 /bfd
parent37225f62c4a8c51a914d588e7e9c361ef363f852 (diff)
downloadgdb-e108f470528369ba8b8d4a2899f0a740d034f33e.zip
gdb-e108f470528369ba8b8d4a2899f0a740d034f33e.tar.gz
gdb-e108f470528369ba8b8d4a2899f0a740d034f33e.tar.bz2
2002-02-07 Daniel Jacobowitz <drow@mvista.com>
* bfd-in.h: Update <stdbool.h> check to only see if <stdbool.h> has been included, not drag it in. * bfd-in2.h: Regenerate.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/bfd-in.h7
-rw-r--r--bfd/bfd-in2.h7
3 files changed, 14 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c3bf16d..d734832 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-07 Daniel Jacobowitz <drow@mvista.com>
+
+ * bfd-in.h: Update <stdbool.h> check to only see if <stdbool.h> has
+ been included, not drag it in.
+ * bfd-in2.h: Regenerate.
+
2002-02-06 H.J. Lu (hjl@gnu.org)
* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Update
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 4b5a370..bd8a915 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -89,12 +89,13 @@ typedef struct _bfd bfd;
/* It gets worse if the host also defines a true/false enum... -sts */
/* And even worse if your compiler has built-in boolean types... -law */
/* And even worse if your compiler provides a stdbool.h that conflicts
- with these definitions... gcc 2.95 and later do. -drow */
+ with these definitions... gcc 2.95 and later do. If so, it must
+ be included first. -drow */
#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
#define TRUE_FALSE_ALREADY_DEFINED
#else
-#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-#include <stdbool.h>
+#if defined (__bool_true_false_are_defined)
+/* We have <stdbool.h>. */
#define TRUE_FALSE_ALREADY_DEFINED
#endif
#endif
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 257287a..b23955d 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -95,12 +95,13 @@ typedef struct _bfd bfd;
/* It gets worse if the host also defines a true/false enum... -sts */
/* And even worse if your compiler has built-in boolean types... -law */
/* And even worse if your compiler provides a stdbool.h that conflicts
- with these definitions... gcc 2.95 and later do. -drow */
+ with these definitions... gcc 2.95 and later do. If so, it must
+ be included first. -drow */
#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
#define TRUE_FALSE_ALREADY_DEFINED
#else
-#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-#include <stdbool.h>
+#if defined (__bool_true_false_are_defined)
+/* We have <stdbool.h>. */
#define TRUE_FALSE_ALREADY_DEFINED
#endif
#endif