Commitc63d7c9

and

authored

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

(cherry picked from commit3a88de7)Co-authored-by: David Hewitt <1939362+davidhewitt@users.noreply.github.com>

1 parentc51cd54 commitc63d7c9Copy full SHA for c63d7c9

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Correctly handle extensions built against debug binaries that reference ``python3_d.dll``.

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,14 +123,15 @@ static char *GetPythonImport (HINSTANCE hModule)`
`123`	`123`	`!strncmp(import_name,"python",6)) {`
`124`	`124`	`char*pch;`
`125`	`125`
`126`		`-#ifndef_DEBUG`
`127`		`-/* In a release version, don't claim that python3.dll is`
`128`		`- a Python DLL. */`
	`126`	`+/* Don't claim that python3.dll is a Python DLL. */`
	`127`	`+#ifdef_DEBUG`
	`128`	`+if (strcmp(import_name,"python3_d.dll")==0) {`
	`129`	`+#else`
`129`	`130`	`if (strcmp(import_name,"python3.dll")==0) {`
	`131`	`+#endif`
`130`	`132`	`import_data+=20;`
`131`	`133`	`continue;`
`132`	`134`	`}`
`133`		`-#endif`
`134`	`135`
`135`	`136`	`/* Ensure python prefix is followed only`
`136`	`137`	`by numbers to the end of the basename */`

Comments

(0)