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
diff --git a/lib/Headers/iso646.h b/lib/Headers/iso646.h
index bca96e6..dca13c5 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 */