From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 18 Oct 2010 00:18:46 +0000 (+0000)
Subject: Merged revisions 85675 via svnmerge from
X-Git-Tag: v3.1.3rc1~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd6a55ec41fe2bd46cf0a5b4ebabb62eda5a19d7;p=thirdparty%2FPython%2Fcpython.git

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 772a85e7f01f..9c19f5ce9d1d 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