Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: Define PY3_DLLNAME as wide string to fix C4133 warnings #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025
Merged

fix: Define PY3_DLLNAME as wide string to fix C4133 warnings #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cmake/extensions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,13 +374,14 @@ add_python_extension(_xxtestfuzz
)

# Python 3.8
set(_wide_char_modifier "L")
add_python_extension(_testinternalcapi
REQUIRES
IS_PY3_8_OR_GREATER
SOURCES
_testinternalcapi.c
DEFINITIONS
"PY3_DLLNAME=\"python3$<$<CONFIG:Debug>:_d>\""
"PY3_DLLNAME=${_wide_char_modifier}\"python3$<$<CONFIG:Debug>:_d>\""
)

# Python 3.9
Expand Down
11 changes: 6 additions & 5 deletions cmake/libpython/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,14 @@ if(WIN32 AND PY_VERSION VERSION_LESS "3.11")
set(PYTHONPATH "${PYTHONPATH}${PATHSEP}.\\\\${PYTHONHOME_ESCAPED}\\\\lib-tk")
endif()

set(_wide_char_modifier)
set(_wide_char_modifier "L")
set(_wide_char_modifier "L")

set_property(
SOURCE ${SRC_DIR}/PC/getpathp.c
PROPERTY COMPILE_DEFINITIONS
"LANDMARK=${_wide_char_modifier}\"${PYTHONHOME_ESCAPED}\\\\os.py\""
"PYTHONPATH=${_wide_char_modifier}\"${PYTHONPATH}\""
"PY3_DLLNAME=\"python3$<$<CONFIG:Debug>:_d>\""
"PY3_DLLNAME=${_wide_char_modifier}\"python3$<$<CONFIG:Debug>:_d>\""
)
endif()

Expand Down Expand Up @@ -217,10 +216,11 @@ elseif(WIN32)
Py_ENABLE_SHARED
MS_DLL_ID="${ms_dll_id}"
)
set(_wide_char_modifier "L")
set_property(
SOURCE ${SRC_DIR}/Python/dynload_win.c
PROPERTY COMPILE_DEFINITIONS
"PY3_DLLNAME=\"python3$<$<CONFIG:Debug>:_d>\"" # Python 3.11
"PY3_DLLNAME=${_wide_char_modifier}\"python3$<$<CONFIG:Debug>:_d>\"" # Python 3.11
)
endif()

Expand Down Expand Up @@ -341,10 +341,11 @@ endif()

# Introduced in Python 3.10 and removed in Python 3.11
if(WIN32 AND "${PY_VERSION_MAJOR}.${PY_VERSION_MINOR}" VERSION_EQUAL "3.10")
set(_wide_char_modifier "L")
set_property(
SOURCE ${SRC_DIR}/Python/pathconfig.c
PROPERTY COMPILE_DEFINITIONS
"PY3_DLLNAME=\"python3$<$<CONFIG:Debug>:_d>\""
"PY3_DLLNAME=${_wide_char_modifier}\"python3$<$<CONFIG:Debug>:_d>\""
)
endif()

Expand Down