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. ........

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. ........
fd6a55ec · R. David Murray · 2e4e1419 · fd6a55ec
Commit fd6a55ec authored Oct 18, 2010 by R. David Murray
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Include/token.h Include/token.h +2 -0

No files found.
--- 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