From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Fri, 31 May 2013 11:18:28 +0000 (-0700)
Subject: <iso646.h>: Avoid conflicts w/ C++ keywords.
X-Git-Tag: v3.7.0~1033
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/052fccef87087cff80925f937ae11f5c4642c362

<iso646.h>: Avoid conflicts w/ C++ keywords.

Fix whitespace too.

Obtained-from:   FreeBSD
---

diff --git a/include/iso646.h b/include/iso646.h
index 6a6b9e57a1..ec0a2e76c5 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -23,23 +23,26 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/iso646.h,v 1.3 1999/08/27 23:44:50 peter Exp $
- * $DragonFly: src/include/iso646.h,v 1.2 2003/06/17 04:25:56 dillon Exp $
+ * $FreeBSD: head/include/iso646.h 225801 2011-09-27 16:33:17Z jkim $
  */
 
 #ifndef _ISO646_H_
-#define _ISO646_H_
+#define	_ISO646_H_
 
-#define and	&&
-#define and_eq	&=
-#define bitand	&
-#define bitor	|
-#define compl	~
-#define not	!
-#define not_eq	!=
-#define or	||
-#define or_eq	|=
-#define xor	^
-#define xor_eq	^=
+#ifndef __cplusplus
+
+#define	and	&&
+#define	and_eq	&=
+#define	bitand	&
+#define	bitor	|
+#define	compl	~
+#define	not	!
+#define	not_eq	!=
+#define	or	||
+#define	or_eq	|=
+#define	xor	^
+#define	xor_eq	^=
+
+#endif /* !__cplusplus */
 
 #endif /* !_ISO646_H_ */