From e108f470528369ba8b8d4a2899f0a740d034f33e Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 7 Feb 2002 22:28:31 +0000 Subject: [PATCH] 2002-02-07 Daniel Jacobowitz * bfd-in.h: Update check to only see if has been included, not drag it in. * bfd-in2.h: Regenerate. --- bfd/ChangeLog | 6 ++++++ bfd/bfd-in.h | 7 ++++--- bfd/bfd-in2.h | 7 ++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c3bf16d71f..d73483232a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2002-02-07 Daniel Jacobowitz + + * bfd-in.h: Update check to only see if 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 4b5a370d3f..bd8a915976 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 +#if defined (__bool_true_false_are_defined) +/* We have . */ #define TRUE_FALSE_ALREADY_DEFINED #endif #endif diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 257287af78..b23955dce3 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 +#if defined (__bool_true_false_are_defined) +/* We have . */ #define TRUE_FALSE_ALREADY_DEFINED #endif #endif