diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/bfd-in.h | 10 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 10 |
3 files changed, 24 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ebd38d6..09b7f8f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +Fri Jan 7 10:29:27 1994 Stan Shebs (shebs@andros.cygnus.com) + + * bfd-in.h: (bfd_boolean): Add workaround for systems that also + define true and false as enums. + (ALMOST_STDC): Add as alternative to __STDC__. + * bfd-in2.h: Rebuilt. + * syms.c (bfd_print_symbol_vandf): Convert a PTR to FILE*. + Thu Jan 6 14:24:44 1994 David J. Mackenzie (djm@thepub.cygnus.com) * aoutx.h (translate_to_native_sym_flags): Catch the case where diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 5de9115..9f3a04a 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -81,7 +81,13 @@ typedef struct _bfd bfd; force me to change it. */ /* typedef enum boolean {false, true} boolean; */ /* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h> -fnf */ +/* It gets worse if the host also defines a true/false enum... -sts */ +#ifndef TRUE_FALSE_ALREADY_DEFINED typedef enum bfd_boolean {false, true} boolean; +#define BFD_TRUE_FALSE +#else +typedef enum bfd_boolean {bfd_false, bfd_true} boolean; +#endif /* A pointer to a position in a file. */ /* FIXME: This should be using off_t from <sys/types.h>. @@ -435,7 +441,7 @@ extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *, #define CAT3(a,b,c) a##b##c #define CAT4(a,b,c,d) a##b##c##d #else -#ifdef __STDC__ +#if defined(__STDC__) || defined(ALMOST_STDC) #define CAT(a,b) a##b #define CAT3(a,b,c) a##b##c #define XCAT2(a,b) CAT(a,b) @@ -536,7 +542,7 @@ void bfd_putb16 PARAMS ((bfd_vma, unsigned char *)); void bfd_putl16 PARAMS ((bfd_vma, unsigned char *)); /* ECOFF linking routines. */ -#ifdef __STDC__ +#if defined(__STDC__) || defined(ALMOST_STDC) struct ecoff_debug_info; struct ecoff_debug_swap; struct ecoff_extr; diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index ef7e748..7bad1b1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -81,7 +81,13 @@ typedef struct _bfd bfd; force me to change it. */ /* typedef enum boolean {false, true} boolean; */ /* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h> -fnf */ +/* It gets worse if the host also defines a true/false enum... -sts */ +#ifndef TRUE_FALSE_ALREADY_DEFINED typedef enum bfd_boolean {false, true} boolean; +#define BFD_TRUE_FALSE +#else +typedef enum bfd_boolean {bfd_false, bfd_true} boolean; +#endif /* A pointer to a position in a file. */ /* FIXME: This should be using off_t from <sys/types.h>. @@ -435,7 +441,7 @@ extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *, #define CAT3(a,b,c) a##b##c #define CAT4(a,b,c,d) a##b##c##d #else -#ifdef __STDC__ +#if defined(__STDC__) || defined(ALMOST_STDC) #define CAT(a,b) a##b #define CAT3(a,b,c) a##b##c #define XCAT2(a,b) CAT(a,b) @@ -536,7 +542,7 @@ void bfd_putb16 PARAMS ((bfd_vma, unsigned char *)); void bfd_putl16 PARAMS ((bfd_vma, unsigned char *)); /* ECOFF linking routines. */ -#ifdef __STDC__ +#if defined(__STDC__) || defined(ALMOST_STDC) struct ecoff_debug_info; struct ecoff_debug_swap; struct ecoff_extr; |