Date: Wed, 5 Oct 2011 15:50:05 +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-9@freebsd.org Subject: svn commit: r226036 - stable/9/include Message-ID: <201110051550.p95Fo5N1018417@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Oct 5 15:50:05 2011 New Revision: 226036 URL: http://svn.freebsd.org/changeset/base/226036 Log: MFC: r226035 Avoid accidental conflicts with C++ operator keywords. Approved by: re (kib) Modified: stable/9/include/iso646.h Directory Properties: stable/9/include/ (props changed) Modified: stable/9/include/iso646.h ============================================================================== --- stable/9/include/iso646.h Wed Oct 5 09:56:43 2011 (r226035) +++ stable/9/include/iso646.h Wed Oct 5 15:50:05 2011 (r226036) @@ -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?201110051550.p95Fo5N1018417>