Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (12 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • python/trunk

  • python/trunk/PC/VS7.1/pyexpat.vcproj

    r2 r391  
    2222                                Optimization="0"
    2323                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    24                                 PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
     24                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
    2525                                RuntimeLibrary="3"
    2626                                UsePrecompiledHeader="2"
    … …  
    7575                                InlineFunctionExpansion="1"
    7676                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    77                                 PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
     77                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
    7878                                StringPooling="TRUE"
    7979                                RuntimeLibrary="2"
    … …  
    131131                                InlineFunctionExpansion="1"
    132132                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    133                                 PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
     133                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
    134134                                StringPooling="TRUE"
    135135                                BasicRuntimeChecks="0"
    … …  
    191191                                InlineFunctionExpansion="1"
    192192                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    193                                 PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
     193                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
    194194                                StringPooling="TRUE"
    195195                                BasicRuntimeChecks="0"
Note: See TracChangeset for help on using the changeset viewer.