diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-07-15 13:18:33 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-07-15 13:18:33 (GMT) |
| commit | 64c066f9bb2daa64cc0cf366d0c0812a828d2d61 (patch) | |
| tree | 934228bab58b4be058c64ed75ac9363292cc7474 /generic/tclMain.c | |
| parent | 773c4c75ee2ec9d60766f09ced30a5fef6d812c6 (diff) | |
| parent | 74d71bafde63ca49cecadc990df7b3a2d7797849 (diff) | |
| download | tcl-dgp_pkg_migration.zip tcl-dgp_pkg_migration.tar.gz tcl-dgp_pkg_migration.tar.bz2 | |
merge trunkdgp_pkg_migration
Diffstat (limited to 'generic/tclMain.c')
| -rw-r--r-- | generic/tclMain.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index f445383..360f5e9 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -47,7 +47,7 @@ * we have to translate that to strcmp here. */ -#ifndef __WIN32__ +#ifndef _WIN32 # define TCHAR char # define TEXT(arg) arg # define _tcscmp strcmp @@ -313,6 +313,9 @@ Tcl_MainEx( Tcl_Channel chan; InteractiveState is; + TclpSetInitialEncodings(); + TclpFindExecutable((const char *)argv[0]); + Tcl_InitMemory(interp); is.interp = interp; @@ -640,7 +643,6 @@ Tcl_Main( * function to call after most initialization * but before starting to execute commands. */ { - Tcl_FindExecutable(argv[0]); Tcl_MainEx(argc, argv, appInitProc, Tcl_CreateInterp()); } #endif /* TCL_MAJOR_VERSION == 8 && !UNICODE */ |