From 4874a7bc27c6a3cd2b0157996de1ea5ace95a9e1 Mon Sep 17 00:00:00 2001
From: espie <>
Date: Thu, 11 Oct 2001 00:05:21 +0000
Subject: [PATCH] C++ has all those as built-ins. Problem found with gcc 3.0.1
 testsuite.

okay theo.
---
 src/include/iso646.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/include/iso646.h b/src/include/iso646.h
index 631dbb8f..535e96bc 100644
--- a/src/include/iso646.h
+++ b/src/include/iso646.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso646.h,v 1.2 1997/09/21 10:45:37 niklas Exp $	*/
+/*	$OpenBSD: iso646.h,v 1.3 2001/10/11 00:05:21 espie Exp $	*/
 /*	$NetBSD: iso646.h,v 1.1 1995/02/17 09:08:10 jtc Exp $	*/
 
 /* 
@@ -9,6 +9,7 @@
 #ifndef _ISO646_H_
 #define _ISO646_H_
 
+#ifndef __cplusplus
 #define and	&&
 #define and_eq	&=
 #define bitand	&
@@ -20,5 +21,6 @@
 #define or_eq	|=
 #define xor	^
 #define xor_eq	^=
+#endif
 
 #endif	/* !_ISO646_H_ */