summaryrefslogtreecommitdiffstats
path: root/Include/token.h
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-10-18 00:18:46 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-10-18 00:18:46 (GMT)
commitfd6a55ec41fe2bd46cf0a5b4ebabb62eda5a19d7 (patch)
treef268f6679345df439211b79ae06ae1c14718ade3 /Include/token.h
parent2e4e1419e5480b05f9038668da85a04c0b6a5991 (diff)
downloadcpython-fd6a55ec41fe2bd46cf0a5b4ebabb62eda5a19d7.zip
cpython-fd6a55ec41fe2bd46cf0a5b4ebabb62eda5a19d7.tar.gz
cpython-fd6a55ec41fe2bd46cf0a5b4ebabb62eda5a19d7.tar.bz2
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. ........
Diffstat (limited to 'Include/token.h')
-rw-r--r--Include/token.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Include/token.h b/Include/token.h
index 772a85e..9c19f5c 100644
--- a/Include/token.h
+++ b/Include/token.h
@@ -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