From 7331c16912719f1ddb04550537c1161c73e4dfc6 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 27 Sep 2011 16:33:17 +0000
Subject: [PATCH] Avoid accidental conflicts with C++ operator keywords.

MFC after:	1 week
---
 include/iso646.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/iso646.h b/include/iso646.h
index d38bf4be6a2e..a11101e525ce 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_ */