summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2001-10-11 00:05:22 +0000
committerMarc Espie <espie@cvs.openbsd.org>2001-10-11 00:05:22 +0000
commitd330ca569d49ee2d1e27285a3621d90efe27623f (patch)
tree4e8249f3d5ede7dff9ab9557d809f27aae5a9f52 /include
parente7f8d2c953ed7e2b3e23ca7fbd55d883f902f14b (diff)
C++ has all those as built-ins. Problem found with gcc 3.0.1 testsuite.
okay theo.
Diffstat (limited to 'include')
-rw-r--r--include/iso646.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/iso646.h b/include/iso646.h
index 631dbb8f200..535e96bcf83 100644
--- a/include/iso646.h
+++ b/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_ */