Index: generic/tclLoad.c =================================================================== --- generic/tclLoad.c.orig +++ generic/tclLoad.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclLoad.c,v 1.16.4.2 2008/11/14 00:22:39 nijtmans Exp $ + * RCS: @(#) $Id: tclLoad.c,v 1.16 2007/02/20 23:24:03 nijtmans Exp $ */ #include "tclInt.h" @@ -795,9 +795,7 @@ Tcl_UnloadObjCmd( if (unLoadProcPtr != NULL) { Tcl_MutexLock(&packageMutex); - if ((pkgPtr->unloadProc != NULL) || (unLoadProcPtr == TclFSUnloadTempFile)) { - (*unLoadProcPtr)(pkgPtr->loadHandle); - } + (*unLoadProcPtr)(pkgPtr->loadHandle); /* * Remove this library from the loaded library cache. @@ -1154,9 +1152,7 @@ TclFinalizeLoad(void) if (pkgPtr->fileName[0] != '\0') { Tcl_FSUnloadFileProc *unLoadProcPtr = pkgPtr->unLoadProcPtr; - if ((unLoadProcPtr != NULL) - && ((pkgPtr->unloadProc != NULL) - || (unLoadProcPtr == TclFSUnloadTempFile))) { + if (unLoadProcPtr != NULL) { (*unLoadProcPtr)(pkgPtr->loadHandle); } }