Date: Wed, 5 Oct 2011 15:52:40 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r226038 - stable/7/include Message-ID: <201110051552.p95FqebU018566@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110051552.p95FqebU018566>