[Python-3000-checkins] r64210 - in python/branches/py3k: Modules/socketmodule.c PC/pyconfig.h
amaury.forgeotdarc
python-3000-checkins at python.org
Fri Jun 13 01:03:42 CEST 2008
Author: amaury.forgeotdarc
Date: Fri Jun 13 01:03:41 2008
New Revision: 64210
Log:
Slowly apply part of #2065: py3k can be compiled with VS8.0
Modified:
python/branches/py3k/Modules/socketmodule.c
python/branches/py3k/PC/pyconfig.h
Modified: python/branches/py3k/Modules/socketmodule.c
==============================================================================
--- python/branches/py3k/Modules/socketmodule.c (original)
+++ python/branches/py3k/Modules/socketmodule.c Fri Jun 13 01:03:41 2008
@@ -5001,8 +5001,12 @@
PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF);
PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);
PyModule_AddIntConstant(m, "RCVALL_SOCKETLEVELONLY", RCVALL_SOCKETLEVELONLY);
+#ifdef RCVALL_IPLEVEL
PyModule_AddIntConstant(m, "RCVALL_IPLEVEL", RCVALL_IPLEVEL);
+#endif
+#ifdef RCVALL_MAX
PyModule_AddIntConstant(m, "RCVALL_MAX", RCVALL_MAX);
+#endif
#endif /* _MSTCPIP_ */
/* Initialize gethostbyname lock */
Modified: python/branches/py3k/PC/pyconfig.h
==============================================================================
--- python/branches/py3k/PC/pyconfig.h (original)
+++ python/branches/py3k/PC/pyconfig.h Fri Jun 13 01:03:41 2008
@@ -158,11 +158,11 @@
/* set the version macros for the windows headers */
#ifdef MS_WINX64
/* 64 bit only runs on XP or greater */
-#define Py_WINVER _WIN32_WINNT_WINXP
+#define Py_WINVER 0x0501 /* _WIN32_WINNT_WINXP */
#define Py_NTDDI NTDDI_WINXP
#else
/* Python 2.6+ requires Windows 2000 or greater */
-#define Py_WINVER _WIN32_WINNT_WIN2K
+#define Py_WINVER 0x0500 /* _WIN32_WINNT_WIN2K */
#define Py_NTDDI NTDDI_WIN2KSP4
#endif
More information about the Python-3000-checkins
mailing list