diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-29 15:51:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-29 15:51:07 (GMT) |
| commit | 6e4833d8fd1cf6c4a266b68af0c11c77d4a7d790 (patch) | |
| tree | 905c01a6e3cf83245304f8ad1d0b9344bf79739a | |
| parent | ae65a0ee04fe0775675b7edf52110864d473ae87 (diff) | |
| parent | 53c93039f618aaec19a74523d45c0bee51de5cd0 (diff) | |
| download | tcl-6e4833d8fd1cf6c4a266b68af0c11c77d4a7d790.zip tcl-6e4833d8fd1cf6c4a266b68af0c11c77d4a7d790.tar.gz tcl-6e4833d8fd1cf6c4a266b68af0c11c77d4a7d790.tar.bz2 | |
Merge 8.7
| -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 37a11ff..69f496e 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2239,7 +2239,9 @@ EXTERN void Tcl_StaticPackage(Tcl_Interp *interp, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); EXTERN Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc); -#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 5d8fdd6..210a094 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3744,7 +3744,6 @@ extern const TclStubs *tclStubsPtr; # define Tcl_MainEx Tcl_MainExW EXTERN TCL_NORETURN 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 4e7cb1f..caf9359 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -4863,7 +4863,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); |