diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-29 15:45:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-29 15:45:39 (GMT) |
| commit | 53c93039f618aaec19a74523d45c0bee51de5cd0 (patch) | |
| tree | b31f8d2c456f7adea64329404f81a3df81c8c68d | |
| parent | 0e525ab2378cfb0dc315ee7959e7453fb4be9a3a (diff) | |
| download | tcl-53c93039f618aaec19a74523d45c0bee51de5cd0.zip tcl-53c93039f618aaec19a74523d45c0bee51de5cd0.tar.gz tcl-53c93039f618aaec19a74523d45c0bee51de5cd0.tar.bz2 | |
Fix correct export on win32 for TclZipfs_AppHook, when not building with -DUNICODE
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | generic/tclDecls.h | 1 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index ff4cd8d..968a469 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2401,7 +2401,9 @@ EXTERN const char * Tcl_PkgInitStubsCheck(Tcl_Interp *interp, const char *version, int exact); EXTERN void Tcl_InitSubsystems(void); EXTERN void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); -#ifndef _WIN32 +#ifdef _WIN32 +EXTERN int TclZipfs_AppHook(int *argc, wchar_t ***argv); +#else EXTERN int TclZipfs_AppHook(int *argc, char ***argv); #endif diff --git a/generic/tclDecls.h b/generic/tclDecls.h index eddd385..b37491a 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3951,7 +3951,6 @@ extern const TclStubs *tclStubsPtr; # define Tcl_MainEx Tcl_MainExW EXTERN void Tcl_MainExW(int argc, wchar_t **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); - EXTERN int TclZipfs_AppHook(int *argc, wchar_t ***argv); #endif #undef TCL_STORAGE_CLASS diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index d59d893..733b97b 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -4877,7 +4877,11 @@ TclZipfs_AppHook( { char *archive; +#ifdef _WIN32 + Tcl_FindExecutable(NULL); +#else /* !_WIN32 */ Tcl_FindExecutable((*argvPtr)[0]); +#endif /* _WIN32 */ archive = (char *) Tcl_GetNameOfExecutable(); TclZipfs_Init(NULL); |