Module Name: src
Committed By: joerg
Date: Fri Apr 26 10:58:45 UTC 2013
Modified Files:
src/include: iso646.h
Log Message:
Do not define the C++ alternative operator names as macros.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/include/iso646.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/iso646.h
diff -u src/include/iso646.h:1.1 src/include/iso646.h:1.2
--- src/include/iso646.h:1.1 Fri Feb 17 09:08:10 1995
+++ src/include/iso646.h Fri Apr 26 10:58:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iso646.h,v 1.1 1995/02/17 09:08:10 jtc Exp $ */
+/* $NetBSD: iso646.h,v 1.2 2013/04/26 10:58:45 joerg Exp $ */
/*
* Written by J.T. Conklin <j...@wimsey.com> 02/16/95.
@@ -8,6 +8,7 @@
#ifndef _ISO646_H_
#define _ISO646_H_
+#ifndef __cplusplus
#define and &&
#define and_eq &=
#define bitand &
@@ -19,5 +20,6 @@
#define or_eq |=
#define xor ^
#define xor_eq ^=
+#endif
#endif /* !_ISO646_H_ */
