mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-101614: Don't treat python3_d.dll as a Python DLL when checking extension modules for incompatibility (GH-101615) 

(cherry picked from commit 3a88de7a0a)

Co-authored-by: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2023-02-08 06:48:42 -08:00 committed by GitHub
parent c51cd54b65
commit c63d7c95ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2023-02-07-18-22-54.gh-issue-101614.NjVP0n.rst Normal file
View File

@ -0,0 +1 @@
Correctly handle extensions built against debug binaries that reference ``python3_d.dll``.

9
Python/dynload_win.c
View File

@ -123,14 +123,15 @@ static char *GetPythonImport (HINSTANCE hModule)
!strncmp(import_name,"python",6)) { !strncmp(import_name,"python",6)) {
char *pch; char *pch;
#ifndef _DEBUG /* Don't claim that python3.dll is a Python DLL. */
/* In a release version, don't claim that python3.dll is #ifdef _DEBUG
a Python DLL. */ if (strcmp(import_name, "python3_d.dll") == 0) {
#else
if (strcmp(import_name, "python3.dll") == 0) { if (strcmp(import_name, "python3.dll") == 0) {
#endif
import_data += 20; import_data += 20;
continue; continue;
} }
#endif
/* Ensure python prefix is followed only /* Ensure python prefix is followed only
by numbers to the end of the basename */ by numbers to the end of the basename */