Kaydet (Commit) 95c06465 authored tarafından Zachary Ware's avatar Zachary Ware

Closes #24953: Merge with 3.5

...@@ -147,7 +147,11 @@ WIN32 is still required for the locale module. ...@@ -147,7 +147,11 @@ WIN32 is still required for the locale module.
#define MS_WINI64 #define MS_WINI64
#define PYD_PLATFORM_TAG "win_ia64" #define PYD_PLATFORM_TAG "win_ia64"
#elif defined(_M_X64) || defined(_M_AMD64) #elif defined(_M_X64) || defined(_M_AMD64)
#if defined(__INTEL_COMPILER)
#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
#else
#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
#endif /* __INTEL_COMPILER */
#define MS_WINX64 #define MS_WINX64
#define PYD_PLATFORM_TAG "win_amd64" #define PYD_PLATFORM_TAG "win_amd64"
#else #else
...@@ -194,7 +198,11 @@ typedef _W64 int ssize_t; ...@@ -194,7 +198,11 @@ typedef _W64 int ssize_t;
#if defined(MS_WIN32) && !defined(MS_WIN64) #if defined(MS_WIN32) && !defined(MS_WIN64)
#if defined(_M_IX86) #if defined(_M_IX86)
#if defined(__INTEL_COMPILER)
#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
#else
#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") #define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
#endif /* __INTEL_COMPILER */
#define PYD_PLATFORM_TAG "win32" #define PYD_PLATFORM_TAG "win32"
#elif defined(_M_ARM) #elif defined(_M_ARM)
#define COMPILER _Py_PASTE_VERSION("32 bit (ARM)") #define COMPILER _Py_PASTE_VERSION("32 bit (ARM)")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment