Fix compile errors from rebasing on main

python · Oct 19, 2023 · 9bc2b6b · 9bc2b6b
1 parent 7b3dd99
commit 9bc2b6b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c
@@ -1,5 +1,11 @@
+#ifndef _MSC_VER
+#include "pyconfig.h"   // Py_NOGIL
+#endif
+
+#ifndef Py_NOGIL
 // Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
 #define Py_LIMITED_API 0x030d0000
+#endif
 
 // gh-85283: On Windows, Py_LIMITED_API requires Py_BUILD_CORE to not attempt
 // linking the extension to python3.lib (which fails). Py_BUILD_CORE_MODULE is

diff --git a/Modules/_testimportmultiple.c b/Modules/_testimportmultiple.c
@@ -4,7 +4,13 @@
  * foo, bar), only the first one is called the same as the compiled file.
  */
 
+#ifndef _MSC_VER
+#include "pyconfig.h"   // Py_NOGIL
+#endif
+
+#ifndef Py_NOGIL
 #define Py_LIMITED_API 0x03020000
+#endif
 
 #include <Python.h>
 

diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
@@ -3,8 +3,14 @@
  * DCE compatible Universally Unique Identifier library.
  */
 
+#ifndef _MSC_VER
+#include "pyconfig.h"   // Py_NOGIL
+#endif
+
+#ifndef Py_NOGIL
 // Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
 #define Py_LIMITED_API 0x030d0000
+#endif
 
 #include "Python.h"
 #if defined(HAVE_UUID_H)

diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
@@ -1,7 +1,13 @@
 /* Errno module */
 
+#ifndef _MSC_VER
+#include "pyconfig.h"   // Py_NOGIL
+#endif
+
+#ifndef Py_NOGIL
 // Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
 #define Py_LIMITED_API 0x030d0000
+#endif
 
 #include "Python.h"
 #include <errno.h>                // EPIPE

diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -16,8 +16,14 @@
 
 /* MD5 objects */
 
+#ifndef _MSC_VER
+#include "pyconfig.h"   // Py_NOGIL
+#endif
+
+#ifndef Py_NOGIL
 // Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
 #define Py_LIMITED_API 0x030d0000
+#endif
 
 #include "Python.h"
 #include "hashlib.h"

diff --git a/Modules/resource.c b/Modules/resource.c
@@ -1,5 +1,11 @@
+#ifndef _MSC_VER
+#include "pyconfig.h"   // Py_NOGIL
+#endif
+
+#ifndef Py_NOGIL
 // Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
 #define Py_LIMITED_API 0x030d0000
+#endif
 
 #include "Python.h"
 #include <errno.h>                // errno