From 0a6f1e351d4d49a2886153bf5fb4268175b5bb8a Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 15 Aug 2021 21:37:09 +0000 Subject: Make tclZipfs.c compilable with a C++ compiler --- generic/tclZipfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index c1ba395..c77e8db 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -3913,7 +3913,7 @@ TclZipfs_TclLibrary(void) } #elif !defined(NO_DLFCN_H) Dl_info dlinfo; - if (dladdr(TclZipfs_TclLibrary, &dlinfo) && (dlinfo.dli_fname != NULL) + if (dladdr((const void *)TclZipfs_TclLibrary, &dlinfo) && (dlinfo.dli_fname != NULL) && (ZipfsAppHookFindTclInit(dlinfo.dli_fname) == TCL_OK)) { return Tcl_NewStringObj(zipfs_literal_tcl_library, -1); } -- cgit v0.12 From 58502bda0b655dcb2b8e619c1cce4ba99f294aad Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 15 Aug 2021 21:47:28 +0000 Subject: Make TCL_MAC_EMPTY_FILE macro work with C++ compiler --- generic/tclInt.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generic/tclInt.h b/generic/tclInt.h index 05167b7..07a5fb6 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -5205,8 +5205,7 @@ typedef struct NRE_callback { #ifdef MAC_OSX_TCL #define TCL_MAC_EMPTY_FILE(name) \ - static __attribute__((used)) const void *const TclUnusedFile_ ## name; \ - static const void *const TclUnusedFile_ ## name = NULL; + static __attribute__((used)) const void *const TclUnusedFile_ ## name = NULL; #else #define TCL_MAC_EMPTY_FILE(name) #endif /* MAC_OSX_TCL */ -- cgit v0.12