Merge pull request #23960 from meeseeksmachine/auto-backport-of-pr-23947-on-v3.6.x

QuLogic · web-flow · commit cf37b763d116 · 2022-09-19T20:41:21.000-04:00
Backport PR #23947 on branch v3.6.x (Fix building on MINGW)
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -231,13 +231,13 @@ bool load_tcl_tk(T lib)
 {
     // Try to fill Tcl/Tk global vars with function pointers.  Return whether
     // all of them have been filled.
-    if (void* ptr = dlsym(lib, "Tcl_SetVar")) {
+    if (auto ptr = dlsym(lib, "Tcl_SetVar")) {
         TCL_SETVAR = (Tcl_SetVar_t)ptr;
     }
-    if (void* ptr = dlsym(lib, "Tk_FindPhoto")) {
+    if (auto ptr = dlsym(lib, "Tk_FindPhoto")) {
         TK_FIND_PHOTO = (Tk_FindPhoto_t)ptr;
     }
-    if (void* ptr = dlsym(lib, "Tk_PhotoPutBlock")) {
+    if (auto ptr = dlsym(lib, "Tk_PhotoPutBlock")) {
         TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)ptr;
     }
     return TCL_SETVAR && TK_FIND_PHOTO && TK_PHOTO_PUT_BLOCK;

Original file line number	Diff line number	Diff line change
`@@ -231,13 +231,13 @@ bool load_tcl_tk(T lib)`
`231`	`231`	`{`
`232`	`232`	`// Try to fill Tcl/Tk global vars with function pointers. Return whether`
`233`	`233`	`// all of them have been filled.`
`234`		`- if (void* ptr = dlsym(lib, "Tcl_SetVar")) {`
	`234`	`+ if (auto ptr = dlsym(lib, "Tcl_SetVar")) {`
`235`	`235`	`TCL_SETVAR = (Tcl_SetVar_t)ptr;`
`236`	`236`	`}`
`237`		`- if (void* ptr = dlsym(lib, "Tk_FindPhoto")) {`
	`237`	`+ if (auto ptr = dlsym(lib, "Tk_FindPhoto")) {`
`238`	`238`	`TK_FIND_PHOTO = (Tk_FindPhoto_t)ptr;`
`239`	`239`	`}`
`240`		`- if (void* ptr = dlsym(lib, "Tk_PhotoPutBlock")) {`
	`240`	`+ if (auto ptr = dlsym(lib, "Tk_PhotoPutBlock")) {`
`241`	`241`	`TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)ptr;`
`242`	`242`	`}`
`243`	`243`	`return TCL_SETVAR && TK_FIND_PHOTO && TK_PHOTO_PUT_BLOCK;`