Skip to content

Commit c316cf3

Browse files
authored
Make PYBIND11_INTERNALS_VERSION 6 the default on all platforms. (#5512)
1 parent 31d7c87 commit c316cf3

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

include/pybind11/detail/internals.h

+3-11
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,14 @@
3737
/// further ABI-incompatible changes may be made before the ABI is officially
3838
/// changed to the new version.
3939
#ifndef PYBIND11_INTERNALS_VERSION
40-
# if PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
41-
// Version bump for Python 3.12+, before first 3.12 beta release.
42-
// Version bump for MSVC piggy-backed on PR #4779. See comments there.
43-
# ifdef Py_GIL_DISABLED
44-
# define PYBIND11_INTERNALS_VERSION 6
45-
# else
46-
# define PYBIND11_INTERNALS_VERSION 5
47-
# endif
48-
# else
49-
# define PYBIND11_INTERNALS_VERSION 4
50-
# endif
40+
# define PYBIND11_INTERNALS_VERSION 6
5141
#endif
5242

5343
// This requirement is mainly to reduce the support burden (see PR #4570).
5444
static_assert(PY_VERSION_HEX < 0x030C0000 || PYBIND11_INTERNALS_VERSION >= 5,
5545
"pybind11 ABI version 5 is the minimum for Python 3.12+");
46+
static_assert(PYBIND11_INTERNALS_VERSION >= 4,
47+
"pybind11 ABI version 4 is the minimum for all platforms.");
5648

5749
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
5850

0 commit comments

Comments
 (0)