summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc3
-rw-r--r--win/tclWinInit.c14
-rw-r--r--win/tclWinInt.h3
3 files changed, 10 insertions, 10 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 1ecb1fd..cecfab3 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.98 2003/01/05 00:44:24 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.99 2003/01/10 15:03:54 vincentdarley Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -709,7 +709,6 @@ $<
install-binaries:
@echo Installing to '$(_INSTALLDIR)'
- @echo.
@echo installing $(TCLLIBNAME)
!if "$(TCLLIB)" != "$(TCLIMPLIB)"
@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index bc0c980..186bb89 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -7,7 +7,7 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclWinInit.c,v 1.36 2002/12/06 23:22:59 hobbs Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.37 2003/01/10 15:03:55 vincentdarley Exp $
*/
#include "tclWinInt.h"
@@ -465,10 +465,12 @@ ToUtf(
/*
*---------------------------------------------------------------------------
*
- * WinEncodingsCleanup --
+ * TclWinFilesystemAndEncodingsCleanup --
*
* Reset information to its original state in finalization to
- * allow for reinitialization to be possible.
+ * allow for reinitialization to be possible. This must not
+ * be called until after the filesystem has been finalised, or
+ * exit crashes may occur when using virtual filesystems.
*
* Results:
* None.
@@ -479,8 +481,8 @@ ToUtf(
*---------------------------------------------------------------------------
*/
-static void
-WinEncodingsCleanup(ClientData clientData)
+void
+TclWinFilesystemAndEncodingsCleanup()
{
TclWinResetInterfaces();
libraryPathEncodingFixed = 0;
@@ -565,8 +567,6 @@ TclpSetInitialEncodings()
encoding = "iso8859-1";
binaryEncoding = Tcl_GetEncoding(NULL, encoding);
}
-
- Tcl_CreateExitHandler(WinEncodingsCleanup, NULL);
}
/*
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 6a65f04..c9be10d 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -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: tclWinInt.h,v 1.18 2003/01/09 10:38:35 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinInt.h,v 1.19 2003/01/10 15:03:55 vincentdarley Exp $
*/
#ifndef _TCLWININT
@@ -112,6 +112,7 @@ EXTERN TclWinProcs *tclWinProcs;
* stubs table.
*/
+EXTERN void TclWinFilesystemAndEncodingsCleanup();
EXTERN void TclWinInit(HINSTANCE hInst);
EXTERN int TclWinSymLinkCopyDirectory(CONST TCHAR* LinkOriginal,
CONST TCHAR* LinkCopy);