Tcl Source Code

Artifact a86c70dd9588c52da96d4955eff9b132e1c9202b:

Attachment "diff.txt" to ticket [2059262fff] added by nijtmans 2008-08-19 15:23:53.

---

*** tclLoad.c.orig      Fri Aug 15 16:53:10 2008
--- tclLoad.c   Wed Aug 13 09:44:41 2008
***************
*** 795,801 ****

           if (unLoadProcPtr != NULL) {
               Tcl_MutexLock(&packageMutex);
!               (*unLoadProcPtr)(pkgPtr->loadHandle);

               /*
                * Remove this library from the loaded library cache.
--- 795,803 ----

           if (unLoadProcPtr != NULL) {
               Tcl_MutexLock(&packageMutex);
!               if (pkgPtr->unloadProc != NULL) {
!                   (*unLoadProcPtr)(pkgPtr->loadHandle);
!               }

               /*
                * Remove this library from the loaded library cache.
***************
*** 1152,1158 ****

       if (pkgPtr->fileName[0] != '\0') {
           Tcl_FSUnloadFileProc *unLoadProcPtr = pkgPtr->unLoadProcPtr;
!           if (unLoadProcPtr != NULL) {
               (*unLoadProcPtr)(pkgPtr->loadHandle);
           }
       }
--- 1154,1160 ----

       if (pkgPtr->fileName[0] != '\0') {
           Tcl_FSUnloadFileProc *unLoadProcPtr = pkgPtr->unLoadProcPtr;
!           if ((unLoadProcPtr != NULL) && (pkgPtr->unloadProc != NULL)) {
               (*unLoadProcPtr)(pkgPtr->loadHandle);
           }
       }