diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-17 13:14:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-17 13:14:34 (GMT) |
| commit | 172de731362f70269020cb954a3488977566aa71 (patch) | |
| tree | ebe94aff746823af712480128cd7c826864668dc /unix/tclAppInit.c | |
| parent | 7c54b6f6fd2a99998ce0daa0b32c8940d1ed5eea (diff) | |
| parent | 86196ac2048f44c7bc4fc2c057558b8e7ebdca11 (diff) | |
| download | tcl-172de731362f70269020cb954a3488977566aa71.zip tcl-172de731362f70269020cb954a3488977566aa71.tar.gz tcl-172de731362f70269020cb954a3488977566aa71.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 aa060ab..3f69f45 100644 --- a/unix/tclAppInit.c +++ b/unix/tclAppInit.c @@ -16,15 +16,19 @@ #error "Don't build with BUILD_tcl/USE_TCL_STUBS!" #endif #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 */ /* @@ -80,7 +84,8 @@ main( #ifdef TCL_LOCAL_MAIN_HOOK TCL_LOCAL_MAIN_HOOK(&argc, &argv); -#else +#elif (TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6) && (!defined(_WIN32) || defined(UNICODE)) + /* New in Tcl 8.7. This doesn't work on Windows without UNICODE */ TclZipfs_AppHook(&argc, &argv); #endif @@ -125,7 +130,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 */ /* |