Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/swig/Lib/python/pyruntime.swg

Issue 5794006: Fix pyautolib so that it builds on Windows in multi-dll mode.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | third_party/swig/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/swig/Lib/python/pyruntime.swg
===================================================================
--- third_party/swig/Lib/python/pyruntime.swg (revision 40423)
+++ third_party/swig/Lib/python/pyruntime.swg (working copy)
@@ -7,7 +7,12 @@
// Make sure our project, which uses the latter, doesn't trigger the
// former since we don't want to debug python itself.
// (http://old.nabble.com/problems-with-python24_d.lib-td4760095.html#a4760095)
+// Also, disable a check in MSVC when building for Multi-threaded Debug DLL
+// that complains about mix of headers with and without _DEBUG.
#ifdef _DEBUG
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#define _CRT_NOFORCE_MANIFEST 1
+#endif
#undef _DEBUG
#include <Python.h>
#define _DEBUG
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | third_party/swig/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698