*** unix/tclAppInit.c	Thu Nov 19 11:24:44 2009
--- unix/tclAppInit.c	Thu Nov 19 11:22:46 2009
***************
*** 21,26 ****
--- 21,27 ----
  #include "tclInt.h"
  
  extern Tcl_PackageInitProc	Tcltest_Init;
+ extern Tcl_PackageInitProc	Tcltest_SafeInit;
  
  #endif /* TCL_TEST */
  
***************
*** 122,129 ****
      if (Tcltest_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }
!     Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
! 	    (Tcl_PackageInitProc *) Tcltest_SafeInit);
  #endif /* TCL_TEST */
  
      /*
--- 123,129 ----
      if (Tcltest_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }
!     Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit);
  #endif /* TCL_TEST */
  
      /*
*** win/tclAppInit.c	Thu Nov 19 11:09:49 2009
--- win/tclAppInit.c	Thu Nov 19 11:22:46 2009
***************
*** 19,28 ****
  #include <locale.h>
  
  #ifdef TCL_TEST
- extern Tcl_PackageInitProc	Procbodytest_Init;
- extern Tcl_PackageInitProc	Procbodytest_SafeInit;
  extern Tcl_PackageInitProc	Tcltest_Init;
! extern Tcl_PackageInitProc	TclObjTest_Init;
  #endif /* TCL_TEST */
  
  #if defined(__GNUC__)
--- 19,26 ----
  #include <locale.h>
  
  #ifdef TCL_TEST
  extern Tcl_PackageInitProc	Tcltest_Init;
! extern Tcl_PackageInitProc	Tcltest_SafeInit;
  #endif /* TCL_TEST */
  
  #if defined(__GNUC__)
***************
*** 135,149 ****
      if (Tcltest_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }
!     Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, NULL);
!     if (TclObjTest_Init(interp) == TCL_ERROR) {
! 	return TCL_ERROR;
!     }
!     if (Procbodytest_Init(interp) == TCL_ERROR) {
! 	return TCL_ERROR;
!     }
!     Tcl_StaticPackage(interp, "procbodytest", Procbodytest_Init,
! 	    Procbodytest_SafeInit);
  #endif /* TCL_TEST */
  
  #if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
--- 133,139 ----
      if (Tcltest_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }
!     Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit);
  #endif /* TCL_TEST */
  
  #if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
