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

diff --git a/Include/token.h b/Include/token.h
index 4250000d135103bf40c61229aa6018f583ac4ec6..72659ac053fd2761e1929039bc5a7837b6c3752d 100644 (file)
--- 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