aboutsummaryrefslogtreecommitdiff
path: root/gcc/system.h
diff options
context:
space:
mode:
authorBernardo Innocenti <bernie@develer.com>2004-07-25 02:32:22 +0200
committerBernardo Innocenti <bernie@gcc.gnu.org>2004-07-25 02:32:22 +0200
commitca79179c0a12a381b7ddef2c47aa805795456776 (patch)
treed8d8d7c1b612ea734a24034ac62245e478be3295 /gcc/system.h
parent8b91e18c05ea23e01e786285a7c6725215201384 (diff)
downloadgcc-ca79179c0a12a381b7ddef2c47aa805795456776.zip
gcc-ca79179c0a12a381b7ddef2c47aa805795456776.tar.gz
gcc-ca79179c0a12a381b7ddef2c47aa805795456776.tar.bz2
system.h (bool, [...]): Don't redefine as preprocessor macros in C++.
* system.h (bool, true, false): Don't redefine as preprocessor macros in C++. From-SVN: r85135
Diffstat (limited to 'gcc/system.h')
-rw-r--r--gcc/system.h26
1 files changed, 18 insertions, 8 deletions
diff --git a/gcc/system.h b/gcc/system.h
index dfc8b08..3411fc4 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