gh-141341: Rename COMPILER macro to _Py_COMPILER on Windows (#141342) · python/cpython@68266c1

GitHub

@@ -118,7 +118,7 @@ WIN32 is still required for the locale module.

118118/* Microsoft C defines _MSC_VER, as does clang-cl.exe */

119119#ifdef_MSC_VER

120120121-/* We want COMPILER to expand to a string containing _MSC_VER's *value*.

121+/* We want _Py_COMPILER to expand to a string containing _MSC_VER's *value*.

122122 * This is horridly tricky, because the stringization operator only works

123123 * on macro arguments, and doesn't evaluate macros passed *as* arguments.

124124 */

@@ -148,7 +148,7 @@ WIN32 is still required for the locale module.

148148#defineMS_WIN64

149149#endif

150150151-/* set the COMPILER and support tier

151+/* set the _Py_COMPILER and support tier

152152 *

153153 * win_amd64 MSVC (x86_64-pc-windows-msvc): 1

154154 * win32 MSVC (i686-pc-windows-msvc): 1

@@ -158,22 +158,22 @@ WIN32 is still required for the locale module.

158158#ifdefMS_WIN64

159159#if defined(_M_X64) || defined(_M_AMD64)

160160#if defined(__clang__)

161-#defineCOMPILER ("[Clang " __clang_version__ "] 64 bit (AMD64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

161+#define_Py_COMPILER ("[Clang " __clang_version__ "] 64 bit (AMD64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

162162#definePY_SUPPORT_TIER 0

163163#elif defined(__INTEL_COMPILER)

164-#defineCOMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

164+#define_Py_COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

165165#definePY_SUPPORT_TIER 0

166166#else

167-#defineCOMPILER _Py_PASTE_VERSION("64 bit (AMD64)")

167+#define_Py_COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")

168168#definePY_SUPPORT_TIER 1

169169#endif/* __clang__ */

170170#definePYD_PLATFORM_TAG "win_amd64"

171171#elif defined(_M_ARM64)

172-#defineCOMPILER _Py_PASTE_VERSION("64 bit (ARM64)")

172+#define_Py_COMPILER _Py_PASTE_VERSION("64 bit (ARM64)")

173173#definePY_SUPPORT_TIER 3

174174#definePYD_PLATFORM_TAG "win_arm64"

175175#else

176-#defineCOMPILER _Py_PASTE_VERSION("64 bit (Unknown)")

176+#define_Py_COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")

177177#definePY_SUPPORT_TIER 0

178178#endif

179179#endif/* MS_WIN64 */

@@ -220,22 +220,22 @@ typedef _W64 int Py_ssize_t;

220220#if defined(MS_WIN32) && !defined(MS_WIN64)

221221#if defined(_M_IX86)

222222#if defined(__clang__)

223-#defineCOMPILER ("[Clang " __clang_version__ "] 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

223+#define_Py_COMPILER ("[Clang " __clang_version__ "] 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

224224#definePY_SUPPORT_TIER 0

225225#elif defined(__INTEL_COMPILER)

226-#defineCOMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

226+#define_Py_COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")

227227#definePY_SUPPORT_TIER 0

228228#else

229-#defineCOMPILER _Py_PASTE_VERSION("32 bit (Intel)")

229+#define_Py_COMPILER _Py_PASTE_VERSION("32 bit (Intel)")

230230#definePY_SUPPORT_TIER 1

231231#endif/* __clang__ */

232232#definePYD_PLATFORM_TAG "win32"

233233#elif defined(_M_ARM)

234-#defineCOMPILER _Py_PASTE_VERSION("32 bit (ARM)")

234+#define_Py_COMPILER _Py_PASTE_VERSION("32 bit (ARM)")

235235#definePYD_PLATFORM_TAG "win_arm32"

236236#definePY_SUPPORT_TIER 0

237237#else

238-#defineCOMPILER _Py_PASTE_VERSION("32 bit (Unknown)")

238+#define_Py_COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")

239239#definePY_SUPPORT_TIER 0

240240#endif

241241#endif/* MS_WIN32 && !MS_WIN64 */

@@ -273,7 +273,7 @@ typedef int pid_t;

273273#warning "Please use an up-to-date version of gcc! (>2.91 recommended)"

274274#endif

275275276-#defineCOMPILER "[gcc]"

276+#define_Py_COMPILER "[gcc]"

277277#definePY_LONG_LONG long long

278278#definePY_LLONG_MIN LLONG_MIN

279279#definePY_LLONG_MAX LLONG_MAX

@@ -286,7 +286,7 @@ typedef int pid_t;

286286/* XXX These defines are likely incomplete, but should be easy to fix.

287287 They should be complete enough to build extension modules. */

288288289-#defineCOMPILER "[lcc-win32]"

289+#define_Py_COMPILER "[lcc-win32]"

290290typedefintpid_t;

291291/* __declspec() is supported here too - do nothing to get the defaults */

292292