aboutsummaryrefslogtreecommitdiff
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
commiteb1df85a342a6022533f51e0fa6b30fa721cf657 (patch)
tree625848b23998b590fdf0f50637ddb14d1dd85764
parent7d83698319d73705c06247037ad665c8ffa53d4a (diff)
Protect iso646.h from C++ (although I can't imagine why someone would
need it...). Patch by Mike Stump. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51360 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Headers/iso646.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Headers/iso646.h b/lib/Headers/iso646.h
index bca96e6180..dca13c5bab 100644
--- a/lib/Headers/iso646.h
+++ b/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 */