diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2011-09-27 16:33:17 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2011-09-27 16:33:17 +0000 |
commit | 7331c16912719f1ddb04550537c1161c73e4dfc6 (patch) | |
tree | 761e05fcec8cf1b856f73990f71807cde7bba275 /include | |
parent | 27274e81b27af8f0a884fec609b7dda505477008 (diff) | |
download | src-7331c16912719f1ddb04550537c1161c73e4dfc6.tar.gz src-7331c16912719f1ddb04550537c1161c73e4dfc6.zip |
Avoid accidental conflicts with C++ operator keywords.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=225801
Diffstat (limited to 'include')
-rw-r--r-- | include/iso646.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/iso646.h b/include/iso646.h index d38bf4be6a2e..a11101e525ce 100644 --- a/include/iso646.h +++ b/include/iso646.h @@ -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_ */ |