summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-12-04 21:19:15 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-12-04 21:19:15 (GMT)
commit199c1fb12767c9ef58c43b56f33ca3113eb738ab (patch)
tree545a48ddf28d3b44bd1730534af8f674aa8e06b3 /generic
parent2eb6dbf5b27a10b106d4ed4774b053de32876cf6 (diff)
downloadtcl-199c1fb12767c9ef58c43b56f33ca3113eb738ab.zip
tcl-199c1fb12767c9ef58c43b56f33ca3113eb738ab.tar.gz
tcl-199c1fb12767c9ef58c43b56f33ca3113eb738ab.tar.bz2
* generic/tclEncoding.c: Different fix for [Bug 1077005].
* generic/tclEvent.c: Broke apart TclpSetInitialEncodings() on * generic/tclInt.h: Windows into TclpSetInterfaces(), that is * unix/tclUnixInit.c: fundamentally essential, and the initialization * win/tclWinInit.c: of the system encoding, which is not. Made the TclpSetInterfaces call part of TclInitSubsystems so it cannot be overlooked.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclEncoding.c4
-rw-r--r--generic/tclEvent.c3
-rw-r--r--generic/tclInt.h3
3 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 3cbf450..a525283 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEncoding.c,v 1.30 2004/12/02 23:24:57 dgp Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.31 2004/12/04 21:19:18 dgp Exp $
*/
#include "tclInt.h"
@@ -513,7 +513,6 @@ TclInitEncodingSubsystem()
Tcl_CreateEncoding(&type);
encodingsInitialized = 1;
- TclpSetInitialEncodings();
}
/*
@@ -1303,6 +1302,7 @@ Tcl_FindExecutable(argv0)
* (native). */
{
TclInitSubsystems();
+ TclpSetInitialEncodings();
TclpFindExecutable(argv0);
}
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 62a2f3b..5a734c4 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEvent.c,v 1.54 2004/12/01 23:18:50 dgp Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.55 2004/12/04 21:19:18 dgp Exp $
*/
#include "tclInt.h"
@@ -801,6 +801,7 @@ TclInitSubsystems()
TclInitObjSubsystem(); /* register obj types, create mutexes */
TclInitIOSubsystem(); /* inits a tsd key (noop) */
TclInitEncodingSubsystem(); /* process wide encoding init */
+ TclpSetInterfaces();
TclInitNamespaceSubsystem(); /* register ns obj type (mutexed) */
}
TclpInitUnlock();
diff --git a/generic/tclInt.h b/generic/tclInt.h
index dbfe454..e7c400f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInt.h,v 1.202 2004/12/01 23:18:51 dgp Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.203 2004/12/04 21:19:18 dgp Exp $
*/
#ifndef _TCLINT
@@ -1962,6 +1962,7 @@ MODULE_SCOPE void TclpPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *,
MODULE_SCOPE char * TclpReadlink _ANSI_ARGS_((CONST char *fileName,
Tcl_DString *linkPtr));
MODULE_SCOPE void TclpReleaseFile _ANSI_ARGS_((TclFile file));
+MODULE_SCOPE void TclpSetInterfaces ();
MODULE_SCOPE void TclpSetVariables _ANSI_ARGS_((Tcl_Interp *interp));
MODULE_SCOPE void TclpUnloadFile _ANSI_ARGS_((
Tcl_LoadHandle loadHandle));