summaryrefslogtreecommitdiffstats
path: root/clang/lib/Headers/iso646.h
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2008-05-21 03:11:31 +0000
committerEli Friedman <eli.friedman@gmail.com>2008-05-21 03:11:31 +0000
commitbcfa2d75d7df633db45ae038628fc9ff62c2ca95 (patch)
tree30ab4d08f7b33c62f79bb0ca9dea33201dbf34c0 /clang/lib/Headers/iso646.h
parente62632e0bb2312eedebf4472d4e18df2c3bf35b2 (diff)
downloadbcm5719-llvm-bcfa2d75d7df633db45ae038628fc9ff62c2ca95.tar.gz
bcm5719-llvm-bcfa2d75d7df633db45ae038628fc9ff62c2ca95.zip
Protect iso646.h from C++ (although I can't imagine why someone would
need it...). Patch by Mike Stump. llvm-svn: 51360
Diffstat (limited to 'clang/lib/Headers/iso646.h')
-rw-r--r--clang/lib/Headers/iso646.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Headers/iso646.h b/clang/lib/Headers/iso646.h
index bca96e6180f..dca13c5babe 100644
--- a/clang/lib/Headers/iso646.h
+++ b/clang/lib/Headers/iso646.h
@@ -26,6 +26,7 @@
#ifndef __ISO646_H
#define __ISO646_H
+#ifndef __cplusplus
#define and &&
#define and_eq &=
#define bitand &
@@ -37,5 +38,6 @@
#define or_eq |=
#define xor ^
#define xor_eq ^=
+#endif
#endif /* __ISO646_H */
OpenPOWER on IntegriCloud