Date: Tue, 27 Sep 2011 16:33:18 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225801 - head/include Message-ID: <201109271633.p8RGXIFr031608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Sep 27 16:33:17 2011 New Revision: 225801 URL: http://svn.freebsd.org/changeset/base/225801 Log: Avoid accidental conflicts with C++ operator keywords. MFC after: 1 week Modified: head/include/iso646.h Modified: head/include/iso646.h ============================================================================== --- head/include/iso646.h Tue Sep 27 15:57:13 2011 (r225800) +++ head/include/iso646.h Tue Sep 27 16:33:17 2011 (r225801) @@ -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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109271633.p8RGXIFr031608>