diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-10-18 00:19:30 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-10-18 00:19:30 (GMT) |
| commit | 0491047580e18f06727146fcdfc6b46c83ef537e (patch) | |
| tree | 45f2f5a9e733a9bcf655819d164b430fc1df48a0 | |
| parent | f2612a55a775ba3053f5d745a24b62754d6567da (diff) | |
| download | cpython-0491047580e18f06727146fcdfc6b46c83ef537e.zip cpython-0491047580e18f06727146fcdfc6b46c83ef537e.tar.gz cpython-0491047580e18f06727146fcdfc6b46c83ef537e.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.
........
| -rw-r--r-- | Include/token.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Include/token.h b/Include/token.h index 4250000..72659ac 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 |