diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-23 10:02:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-23 10:02:53 (GMT) |
| commit | 472a20da74ae386ba8360843638d81fceb84ed5a (patch) | |
| tree | d63884fd865b7090b30af7cd0068b0ba8c050db8 | |
| parent | 09f7aea207ccf5c5105b1140855b3984fa9043b4 (diff) | |
| download | tk-472a20da74ae386ba8360843638d81fceb84ed5a.zip tk-472a20da74ae386ba8360843638d81fceb84ed5a.tar.gz tk-472a20da74ae386ba8360843638d81fceb84ed5a.tar.bz2 | |
Fix [4efbfe2d6a]: Wrong order in winMain.c for TCL_USE_STATIC_PACKAGES
| -rw-r--r-- | win/winMain.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/win/winMain.c b/win/winMain.c index 3920801..14eb718 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -203,6 +203,17 @@ Tcl_AppInit( if ((Tcl_Init)(interp) == TCL_ERROR) { return TCL_ERROR; } +#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES + if (Registry_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + Tcl_StaticLibrary(interp, "Registry", Registry_Init, 0); + + if (Dde_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + Tcl_StaticLibrary(interp, "Dde", Dde_Init, Dde_SafeInit); +#endif if (Tk_Init(interp) == TCL_ERROR) { return TCL_ERROR; } @@ -218,18 +229,6 @@ Tcl_AppInit( return TCL_ERROR; } } -#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES - if (Registry_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - Tcl_StaticLibrary(interp, "Registry", Registry_Init, 0); - - if (Dde_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - Tcl_StaticLibrary(interp, "Dde", Dde_Init, Dde_SafeInit); -#endif - #ifdef TK_TEST if (Tktest_Init(interp) == TCL_ERROR) { return TCL_ERROR; |