[src/trunk]: src/include Do not define the C++ alternative operator names as ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e39724072c4
branches:  trunk
changeset: 786318:9e39724072c4
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Apr 26 10:58:45 2013 +0000

description:
Do not define the C++ alternative operator names as macros.

diffstat:

 include/iso646.h |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 15db3421b3a2 -r 9e39724072c4 include/iso646.h
--- a/include/iso646.h  Fri Apr 26 10:58:22 2013 +0000
+++ b/include/iso646.h  Fri Apr 26 10:58:45 2013 +0000
@@ -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 <jtc%wimsey.com@localhost> 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_ */