[Python-checkins] r85676 - in python/branches/release31-maint: Include/token.h
r.david.murray
python-checkins at python.org
Mon Oct 18 02:18:46 CEST 2010
Author: r.david.murray
Date: Mon Oct 18 02:18:46 2010
New Revision: 85676
Log:
Merged revisions 85675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85675 | r.david.murray | 2010-10-17 20:15:31 -0400 (Sun, 17 Oct 2010) | 4 lines
#4499: silence compiler warning on AIX.
Patch from ActiveState.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Include/token.h
Modified: python/branches/release31-maint/Include/token.h
==============================================================================
--- python/branches/release31-maint/Include/token.h (original)
+++ python/branches/release31-maint/Include/token.h Mon Oct 18 02:18:46 2010
@@ -7,6 +7,8 @@
extern "C" {
#endif
+#undef TILDE /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
+
#define ENDMARKER 0
#define NAME 1
#define NUMBER 2
More information about the Python-checkins
mailing list