FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-101614: don't treat python3_d.dll as a Python dll by davidhewitt · Pull Request #101615 · python/cpython · GitHub

/ cpython Public

gh-101614: don't treat python3_d.dll as a Python dll #101615

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
zooba merged 2 commits into from
Feb 8, 2023
+6 −4
Conversation 6 Commits 2 Checks 0 Files changed 2
Merged

gh-101614: don't treat python3_d.dll as a Python dll #101615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e29ba
gh-101614: don't treat python3_d.dll as a Python dll
davidhewitt Feb 6, 2023
40975a6
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 7, 2023
File filter

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2023-02-07-18-22-54.gh-issue-101614.NjVP0n.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correctly handle extensions built against debug binaries that reference ``python3_d.dll``.
9 changes: 5 additions & 4 deletions Python/dynload_win.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,15 @@ static char *GetPythonImport (HINSTANCE hModule)
!strncmp(import_name,"python",6)) {
char *pch;

#ifndef _DEBUG
/* In a release version, don't claim that python3.dll is
a Python DLL. */
/* Don't claim that python3.dll is a Python DLL. */
#ifdef _DEBUG
if (strcmp(import_name, "python3_d.dll") == 0) {
#else
if (strcmp(import_name, "python3.dll") == 0) {
#endif
import_data += 20;
continue;
}
#endif

/* Ensure python prefix is followed only
by numbers to the end of the basename */
Expand Down
Back | FazBrowse Home | New Git URL