Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/pybind11/detail/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@
# define PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF
#endif

// Slightly faster code paths are available when PYBIND11_SUBINTERPRETER_SUPPORT is *not* defined,
// so avoid defining it for implementations that do not support subinterpreters.
// However, defining it unnecessarily is not expected to break anything.
// Slightly faster code paths are available when PYBIND11_HAS_SUBINTERPRETER_SUPPORT is *not*
// defined, so avoid defining it for implementations that do not support subinterpreters. However,
// defining it unnecessarily is not expected to break anything.
#if PY_VERSION_HEX >= 0x030C0000 && !defined(PYPY_VERSION) && !defined(GRAALVM_PYTHON)
# define PYBIND11_SUBINTERPRETER_SUPPORT
# define PYBIND11_HAS_SUBINTERPRETER_SUPPORT
#endif

// 3.12 Compatibility
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/detail/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ inline std::atomic<int> &get_num_interpreters_seen() {

template <typename InternalsType>
inline std::unique_ptr<InternalsType> *&get_internals_pp() {
#ifdef PYBIND11_SUBINTERPRETER_SUPPORT
#ifdef PYBIND11_HAS_SUBINTERPRETER_SUPPORT
if (get_num_interpreters_seen() > 1) {
// Internals is one per interpreter. When multiple interpreters are alive in different
// threads we have to allow them to have different internals, so we need a thread_local.
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/subinterpreter.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <stdexcept>

#if !defined(PYBIND11_SUBINTERPRETER_SUPPORT)
#if !defined(PYBIND11_HAS_SUBINTERPRETER_SUPPORT)
# error "This platform does not support subinterpreters, do not include this file."
#endif

Expand Down
4 changes: 2 additions & 2 deletions tests/test_embed/test_subinterpreter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <pybind11/embed.h>
#ifdef PYBIND11_SUBINTERPRETER_SUPPORT
#ifdef PYBIND11_HAS_SUBINTERPRETER_SUPPORT
# include <pybind11/subinterpreter.h>

// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to
Expand Down Expand Up @@ -428,4 +428,4 @@ TEST_CASE("Per-Subinterpreter GIL") {
}
# endif // Py_MOD_PER_INTERPRETER_GIL_SUPPORTED

#endif // PYBIND11_SUBINTERPRETER_SUPPORT
#endif // PYBIND11_HAS_SUBINTERPRETER_SUPPORT
Loading