Skip to content

Commit 76eeef3

Browse files
authored
Merge pull request #30104 from rwgk/fix_merge_accident_pywrapcc
Fix merge accident: Equivalent of pybind/pybind11#5026 applied to pybind11/detail/abi_platform_id.h
2 parents fd4c85e + ec3c696 commit 76eeef3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/pybind11/detail/abi_platform_id.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
/// Classic / Conservative / Progressive cross-module compatibility
7272
#ifndef PYBIND11_INTERNALS_SH_DEF
7373
# if defined(PYBIND11_USE_SMART_HOLDER_AS_DEFAULT)
74-
# define PYBIND11_INTERNALS_SH_DEF ""
75-
# else
7674
# define PYBIND11_INTERNALS_SH_DEF "_sh_def"
75+
# else
76+
# define PYBIND11_INTERNALS_SH_DEF ""
7777
# endif
7878
#endif
7979

0 commit comments

Comments
 (0)