From: R. David Murray Date: Mon, 18 Oct 2010 00:19:30 +0000 (+0000) Subject: Merged revisions 85675 via svnmerge from X-Git-Tag: v2.7.1rc1~131 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0491047580e18f06727146fcdfc6b46c83ef537e;p=python 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 4250000d13..72659ac053 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