From owner-svn-src-all@FreeBSD.ORG  Wed Oct  5 15:52:40 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7214A106566B;
	Wed,  5 Oct 2011 15:52:40 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 614BE8FC17;
	Wed,  5 Oct 2011 15:52:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95FqepI018568;
	Wed, 5 Oct 2011 15:52:40 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95FqebU018566;
	Wed, 5 Oct 2011 15:52:40 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201110051552.p95FqebU018566@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 5 Oct 2011 15:52:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226038 - stable/7/include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Oct 2011 15:52:40 -0000

Author: jkim
Date: Wed Oct  5 15:52:40 2011
New Revision: 226038
URL: http://svn.freebsd.org/changeset/base/226038

Log:
  MFC:	r225801
  
  Avoid accidental conflicts with C++ operator keywords.

Modified:
  stable/7/include/iso646.h
Directory Properties:
  stable/7/include/   (props changed)

Modified: stable/7/include/iso646.h
==============================================================================
--- stable/7/include/iso646.h	Wed Oct  5 15:52:04 2011	(r226037)
+++ stable/7/include/iso646.h	Wed Oct  5 15:52:40 2011	(r226038)
@@ -29,6 +29,8 @@
 #ifndef _ISO646_H_
 #define	_ISO646_H_
 
+#ifndef __cplusplus
+
 #define	and	&&
 #define	and_eq	&=
 #define	bitand	&
@@ -41,4 +43,6 @@
 #define	xor	^
 #define	xor_eq	^=
 
+#endif /* !__cplusplus */
+
 #endif /* !_ISO646_H_ */