Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 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/_elementtree.vcproj

    r2 r391  
    2323                                Optimization="0"
    2424                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    25                                 PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
     25                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
    2626                                RuntimeLibrary="3"
    2727                                UsePrecompiledHeader="2"
    … …  
    7676                                InlineFunctionExpansion="1"
    7777                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    78                                 PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
     78                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
    7979                                StringPooling="TRUE"
    8080                                RuntimeLibrary="2"
    … …  
    132132                                InlineFunctionExpansion="1"
    133133                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    134                                 PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
     134                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
    135135                                StringPooling="TRUE"
    136136                                BasicRuntimeChecks="0"
    … …  
    192192                                InlineFunctionExpansion="1"
    193193                                AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
    194                                 PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
     194                                PreprocessorDefinitions="Py_BUILD_CORE_MODULE;NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
    195195                                StringPooling="TRUE"
    196196                                BasicRuntimeChecks="0"
Note: See TracChangeset for help on using the changeset viewer.