From 023d0c6af0f461b6c93aee29638b36a5b28dd69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Mon, 19 Sep 2022 08:57:50 +0100 Subject: [PATCH 1/2] Fix building on MINGW --- src/_tkagg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp index bbca8e8d066c..86d54ca61c30 100644 --- 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; From 62058a47afff68f76a89d8905ed931fcf4779165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Mon, 19 Sep 2022 10:02:39 +0100 Subject: [PATCH 2/2] Fix typo --- src/_tkagg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp index 86d54ca61c30..663c06fd0474 100644 --- a/src/_tkagg.cpp +++ b/src/_tkagg.cpp @@ -237,7 +237,7 @@ bool load_tcl_tk(T lib) if (auto ptr = dlsym(lib, "Tk_FindPhoto")) { TK_FIND_PHOTO = (Tk_FindPhoto_t)ptr; } - if (auto* 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;