summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2011-09-27 16:33:17 +0000
committerjkim <jkim@FreeBSD.org>2011-09-27 16:33:17 +0000
commiteda0c8ad65d79d8f92a7ca7698c6ca66ddc1e066 (patch)
tree761e05fcec8cf1b856f73990f71807cde7bba275
parent0a0c98d37666027f8182714200e454406c6dd282 (diff)
downloadFreeBSD-src-eda0c8ad65d79d8f92a7ca7698c6ca66ddc1e066.zip
FreeBSD-src-eda0c8ad65d79d8f92a7ca7698c6ca66ddc1e066.tar.gz
Avoid accidental conflicts with C++ operator keywords.
MFC after: 1 week
-rw-r--r--include/iso646.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/iso646.h b/include/iso646.h
index d38bf4b..a11101e 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -29,6 +29,8 @@
#ifndef _ISO646_H_
#define _ISO646_H_
+#ifndef __cplusplus
+
#define and &&
#define and_eq &=
#define bitand &
@@ -41,4 +43,6 @@
#define xor ^
#define xor_eq ^=
+#endif /* !__cplusplus */
+
#endif /* !_ISO646_H_ */
OpenPOWER on IntegriCloud