===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/iso646.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/include/iso646.h	1997/09/21 10:45:37	1.2
--- src/include/iso646.h	2001/10/11 00:05:21	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: iso646.h,v 1.2 1997/09/21 10:45:37 niklas Exp $	*/
  /*	$NetBSD: iso646.h,v 1.1 1995/02/17 09:08:10 jtc Exp $	*/
  
  /* 
--- 1,4 ----
! /*	$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,14 ****
--- 9,15 ----
  #ifndef _ISO646_H_
  #define _ISO646_H_
  
+ #ifndef __cplusplus
  #define and	&&
  #define and_eq	&=
  #define bitand	&
***************
*** 20,24 ****
--- 21,26 ----
  #define or_eq	|=
  #define xor	^
  #define xor_eq	^=
+ #endif
  
  #endif	/* !_ISO646_H_ */