Merge branch 'pybind:master' into master

pybind · Aug 23, 2023 · 6b905e5 · 6b905e5
2 parents a6c8bbf + 76b8858
commit 6b905e5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h
@@ -291,9 +291,12 @@ struct type_info {
 #endif
 
 /// On Linux/OSX, changes in __GXX_ABI_VERSION__ indicate ABI incompatibility.
+/// On MSVC, changes in _MSC_VER may indicate ABI incompatibility (#2898).
 #ifndef PYBIND11_BUILD_ABI
 #    if defined(__GXX_ABI_VERSION)
 #        define PYBIND11_BUILD_ABI "_cxxabi" PYBIND11_TOSTRING(__GXX_ABI_VERSION)
+#    elif defined(_MSC_VER)
+#        define PYBIND11_BUILD_ABI "_mscver" PYBIND11_TOSTRING(_MSC_VER)
 #    else
 #        define PYBIND11_BUILD_ABI ""
 #    endif