summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 22:48:32 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 22:48:32 +0000
commit32a4f1753784cdcd049523536e03f58a473c1023 (patch)
tree3b83c5752f635d0fe01557d3af89a62e92ef5bbd
parent5a4a095b483a4257c0443959a6b092901bebcc9f (diff)
downloadchromium_src-32a4f1753784cdcd049523536e03f58a473c1023.zip
chromium_src-32a4f1753784cdcd049523536e03f58a473c1023.tar.gz
chromium_src-32a4f1753784cdcd049523536e03f58a473c1023.tar.bz2
Update swig to work correctly with Mac OS X 10.9.
BUG=305277 TEST=as in bug TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/30113003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230533 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/swig/README.chromium8
2 files changed, 6 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index da79808..cd262df 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ vars = {
"chromium_git": "https://chromium.googlesource.com",
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"skia_git": "https://skia.googlesource.com",
- "swig_revision": "69281",
+ "swig_revision": "230490",
"nacl_revision": "12284",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
diff --git a/third_party/swig/README.chromium b/third_party/swig/README.chromium
index 49754fa..d82b7de 100644
--- a/third_party/swig/README.chromium
+++ b/third_party/swig/README.chromium
@@ -15,6 +15,8 @@ languages need to access the underlying C/C++ code.
Local Modifications:
- Removed all non-python bindings from Lib/.
- Edit Lib/python/pyruntime.swg to include Python.h without the _DEBUG macro to
-avoid requiring python<ver>_d.lib since we do not intend to debug python. Also
-disable a MSVC warning about mixing headers with and without _DEBUG.
-
+ avoid requiring python<ver>_d.lib since we do not intend to debug python. Also
+ disable a MSVC warning about mixing headers with and without _DEBUG.
+- Edit Lib/python/pyruntime.swg to include <Python/Python.h> rather than
+ <Python.h> on the Mac.
+ http://crbug.com/305277 https://sourceforge.net/p/swig/bugs/1346/