diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-01 12:22:32 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-01 12:22:32 (GMT) |
| commit | 938526609f4bd3af2ab9660fa57065cd77674388 (patch) | |
| tree | a6772bc55e731e38a6f092d497575f99a207ac44 /PCbuild9 | |
| parent | 85984227ab7bc6b0625a897be49a4677c4f0eb47 (diff) | |
| download | cpython-938526609f4bd3af2ab9660fa57065cd77674388.zip cpython-938526609f4bd3af2ab9660fa57065cd77674388.tar.gz cpython-938526609f4bd3af2ab9660fa57065cd77674388.tar.bz2 | |
Merged revisions 59245-59254 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59245 | georg.brandl | 2007-11-30 23:04:45 +0100 (Fri, 30 Nov 2007) | 2 lines
Move lchmod() docs to correct place, and add versionadded tags.
........
r59249 | christian.heimes | 2007-11-30 23:36:10 +0100 (Fri, 30 Nov 2007) | 2 lines
Backport of -r59242:59246 from py3k
Fixed problem with regrtest caused by the additional of objects to _abcoll.
........
r59253 | christian.heimes | 2007-12-01 02:03:20 +0100 (Sat, 01 Dec 2007) | 1 line
Although pyconfig.h claims that WIN32 is obsolete it is still required for the locale module. locale.getdefaultlocale() fails silently w/o the WIN32 macro.
........
r59254 | christian.heimes | 2007-12-01 12:20:10 +0100 (Sat, 01 Dec 2007) | 3 lines
Feature #1534
Added PyFloat_GetMax(), PyFloat_GetMin() and PyFloat_GetInfo() to the float API.
Added a dictionary sys.float_info with information about the internal floating point type to the sys module.
........
Diffstat (limited to 'PCbuild9')
| -rw-r--r-- | PCbuild9/pythoncore.vcproj | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj index 1df98d4..16d16d0 100644 --- a/PCbuild9/pythoncore.vcproj +++ b/PCbuild9/pythoncore.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" /> <Tool @@ -119,7 +119,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" /> <Tool @@ -197,7 +197,7 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="3" /> <Tool @@ -275,7 +275,7 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="3" /> <Tool @@ -349,7 +349,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" /> <Tool @@ -424,7 +424,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" /> <Tool @@ -499,7 +499,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" /> <Tool @@ -574,7 +574,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " AdditionalIncludeDirectories="..\Python;..\Modules\zlib" - PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED" + PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32" RuntimeLibrary="2" /> <Tool |