diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-14 08:47:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-14 08:47:53 (GMT) |
| commit | 7f42387e71a69b938ecd25945d10f01f6e39bcc7 (patch) | |
| tree | d6de8446022309740483d0f2db7f089749623f34 /unix/tclAppInit.c | |
| parent | 9ffcf83c49f17eca5cd2005902d378ac59aa7adf (diff) | |
| parent | ccfe3f47fd0a170a819d29e0b22bba0003546796 (diff) | |
| download | tcl-7f42387e71a69b938ecd25945d10f01f6e39bcc7.zip tcl-7f42387e71a69b938ecd25945d10f01f6e39bcc7.tar.gz tcl-7f42387e71a69b938ecd25945d10f01f6e39bcc7.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix/tclAppInit.c')
| -rw-r--r-- | unix/tclAppInit.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c index 3587f35..f3caae7 100644 --- a/unix/tclAppInit.c +++ b/unix/tclAppInit.c @@ -15,15 +15,19 @@ #undef BUILD_tcl #undef STATIC_BUILD #include "tcl.h" +#if TCL_MAJOR_VERSION < 9 && TCL_MINOR_VERSION < 7 +# define Tcl_LibraryInitProc Tcl_PackageInitProc +# define Tcl_StaticLibrary Tcl_StaticPackage +#endif #ifdef TCL_TEST -extern Tcl_PackageInitProc Tcltest_Init; -extern Tcl_PackageInitProc Tcltest_SafeInit; +extern Tcl_LibraryInitProc Tcltest_Init; +extern Tcl_LibraryInitProc Tcltest_SafeInit; #endif /* TCL_TEST */ #ifdef TCL_XT_TEST extern void XtToolkitInitialize(void); -extern Tcl_PackageInitProc Tclxttest_Init; +extern Tcl_LibraryInitProc Tclxttest_Init; #endif /* TCL_XT_TEST */ /* @@ -79,7 +83,8 @@ main( #ifdef TCL_LOCAL_MAIN_HOOK TCL_LOCAL_MAIN_HOOK(&argc, &argv); -#else +#elif !defined(_WIN32) || defined(UNICODE) + /* This doesn't work on Windows without UNICODE */ TclZipfs_AppHook(&argc, &argv); #endif @@ -124,7 +129,7 @@ Tcl_AppInit( if (Tcltest_Init(interp) == TCL_ERROR) { return TCL_ERROR; } - Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit); + Tcl_StaticLibrary(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit); #endif /* TCL_TEST */ /* |