diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/system.h | 26 |
2 files changed, 23 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 19dae5dbd01..f4c844fa554 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-07-25 Bernardo Innocenti <bernie@develer.com> + + * system.h (bool, true, false): Don't redefine as preprocessor macros + in C++. + 2004-07-24 Roger Sayle <roger@eyesopen.com> * expmed.c (init_expmed): A signed modulus by a power of two is diff --git a/gcc/system.h b/gcc/system.h index dfc8b089c71..3411fc43491 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -505,18 +505,28 @@ extern int snprintf (char *, size_t, const char *, ...); and even if it is, it is liable to be buggy. This must be after all inclusion of system headers, as some of them will mess us up. */ -#undef bool -#undef true -#undef false + #undef TRUE #undef FALSE -#define bool unsigned char -#define true 1 -#define false 0 +#ifdef __cplusplus + /* Obsolete. */ +# define TRUE true +# define FALSE false +#else /* !__cplusplus */ +# undef bool +# undef true +# undef false + +# define bool unsigned char +# define true 1 +# define false 0 + + /* Obsolete. */ +# define TRUE true +# define FALSE false +#endif /* !__cplusplus */ -#define TRUE true -#define FALSE false /* Some compilers do not allow the use of unsigned char in bitfields. */ #define BOOL_BITFIELD unsigned int |