diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-09 20:58:00 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-09 20:58:00 (GMT) |
| commit | a8223149e14bed011d604edb20f17f6d5d3b08cd (patch) | |
| tree | 284f6c31c0e8c7a0eb89328908f38d658d738192 /PC/pyconfig.h | |
| parent | 3ecfea71ffec6cb51c5d57f8d750dbac78092659 (diff) | |
| download | cpython-a8223149e14bed011d604edb20f17f6d5d3b08cd.zip cpython-a8223149e14bed011d604edb20f17f6d5d3b08cd.tar.gz cpython-a8223149e14bed011d604edb20f17f6d5d3b08cd.tar.bz2 | |
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60696-60698 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60696 | christian.heimes | 2008-02-09 20:55:22 +0100 (Sat, 09 Feb 2008) | 5 lines
Issue #1706: Require Windows 2000+
Added Py_BUILD_CORE_MODULES macro to set WINVER and NTDDI_VERSION to Windows 2000 for core modules, too
Added -d option to build.bat (same as -c Debug) and fixed warning about /build option
Updated Windows related readme.txt files
........
Diffstat (limited to 'PC/pyconfig.h')
| -rw-r--r-- | PC/pyconfig.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index eb92b41..53645a7 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -158,10 +158,12 @@ WIN32 is still required for the locale module. /* set the version macros for the windows headers */ #ifdef MS_WINX64 /* 64 bit only runs on XP or greater */ -#define Py_WINVER 0x0501 +#define Py_WINVER _WIN32_WINNT_WINXP +#define Py_NTDDI NTDDI_WINXP #else -/* NT 4.0 or greater required otherwise */ -#define Py_WINVER 0x0400 +/* Python 2.6+ requires Windows 2000 or greater */ +#define Py_WINVER _WIN32_WINNT_WIN2K +#define Py_NTDDI NTDDI_WIN2KSP4 #endif /* We only set these values when building Python - we don't want to force @@ -171,7 +173,10 @@ WIN32 is still required for the locale module. structures etc so it can optionally use new Windows features if it determines at runtime they are available. */ -#ifdef Py_BUILD_CORE +#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE) +#ifndef NTDDI_VERSION +#define NTDDI_VERSION Py_NTDDI +#endif #ifndef WINVER #define WINVER Py_WINVER #endif |