*** win/winMain.c.orig	Wed Nov  3 01:43:09 1999
--- win/winMain.c	Sun Jan 16 17:43:07 2000
***************
*** 12,17 ****
--- 12,19 ----
   * RCS: @(#) $Id: winMain.c,v 1.7.6.1 1999/11/03 00:43:09 hobbs Exp $
   */
  
+ #undef TCL_USE_STUBS
+ 
  #include <tk.h>
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
***************
*** 32,45 ****
   */
  
  static void		setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr));
! static void		WishPanic _ANSI_ARGS_(TCL_VARARGS(char *,format));
  
  #ifdef TK_TEST
  extern int		Tktest_Init(Tcl_Interp *interp);
  #endif /* TK_TEST */
  
  #ifdef TCL_TEST
! extern int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
  extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
  #endif /* TCL_TEST */
  
--- 34,47 ----
   */
  
  static void		setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr));
! static void		WishPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *,format));
  
  #ifdef TK_TEST
  extern int		Tktest_Init(Tcl_Interp *interp);
  #endif /* TK_TEST */
  
  #ifdef TCL_TEST
! extern int		Objtest_Init _ANSI_ARGS_((Tcl_Interp *interp));
  extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
  #endif /* TCL_TEST */
  
***************
*** 154,162 ****
      }
      Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
              (Tcl_PackageInitProc *) NULL);
!     if (TclObjTest_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }
  #endif /* TCL_TEST */
  
  #ifdef TK_TEST
--- 156,166 ----
      }
      Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
              (Tcl_PackageInitProc *) NULL);
!     if (Objtest_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }
+     Tcl_StaticPackage(interp, "Objtest", Objtest_Init,
+             (Tcl_PackageInitProc *) NULL);
  #endif /* TCL_TEST */
  
  #ifdef TK_TEST
***************
*** 196,208 ****
   */
  
  void
! WishPanic TCL_VARARGS_DEF(char *,arg1)
  {
      va_list argList;
      char buf[1024];
!     char *format;
!     
!     format = TCL_VARARGS_START(char *,arg1,argList);
      vsprintf(buf, format, argList);
  
      MessageBeep(MB_ICONEXCLAMATION);
--- 200,212 ----
   */
  
  void
! WishPanic TCL_VARARGS_DEF(CONST char *,arg1)
  {
      va_list argList;
      char buf[1024];
!     CONST char *format;
! 
!     format = TCL_VARARGS_START(CONST char *,arg1,argList);
      vsprintf(buf, format, argList);
  
      MessageBeep(MB_ICONEXCLAMATION);
