Skip to content

Commit

Permalink
Merge pull request #30104 from rwgk/fix_merge_accident_pywrapcc
Browse files Browse the repository at this point in the history
Fix merge accident: Equivalent of pybind/pybind11#5026 applied to pybind11/detail/abi_platform_id.h
  • Loading branch information
Ralf W. Grosse-Kunstleve authored Feb 20, 2024
2 parents fd4c85e + ec3c696 commit 76eeef3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/pybind11/detail/abi_platform_id.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
/// Classic / Conservative / Progressive cross-module compatibility
#ifndef PYBIND11_INTERNALS_SH_DEF
# if defined(PYBIND11_USE_SMART_HOLDER_AS_DEFAULT)
# define PYBIND11_INTERNALS_SH_DEF ""
# else
# define PYBIND11_INTERNALS_SH_DEF "_sh_def"
# else
# define PYBIND11_INTERNALS_SH_DEF ""
# endif
#endif

Expand Down

0 comments on commit 76eeef3

Please sign in to comment.