*** win/tkWinTest.c.orig	Fri Apr 16 03:51:53 1999
--- win/tkWinTest.c	Sun Jan 16 17:43:07 2000
***************
*** 17,25 ****
--- 17,34 ----
  HWND tkWinCurrentDialog;
   
  /*
+  * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
+  * Tkptest_Init declaration is in the source file itself, which is only
+  * accessed when we are building a library.
+  */
+ 
+ #undef TCL_STORAGE_CLASS
+ #define TCL_STORAGE_CLASS DLLEXPORT
+ /*
   * Forward declarations of procedures defined later in this file:
   */
  
+ EXTERN int		Tkptest_Init(Tcl_Interp *interp);
  int			TkplatformtestInit(Tcl_Interp *interp);
  static int		TestclipboardCmd(ClientData clientData,
  			    Tcl_Interp *interp, int argc, char **argv);
***************
*** 48,57 ****
  TkplatformtestInit(
      Tcl_Interp *interp)		/* Interpreter to add commands to. */
  {
      /*
       * Add commands for platform specific tests on MacOS here.
       */
!     
      Tcl_CreateCommand(interp, "testclipboard", TestclipboardCmd,
  	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
      Tcl_CreateCommand(interp, "testwinevent", TestwineventCmd,
--- 57,94 ----
  TkplatformtestInit(
      Tcl_Interp *interp)		/* Interpreter to add commands to. */
  {
+     return Tkptest_Init(interp);
+ }
+ /*
+  *----------------------------------------------------------------------
+  *
+  * Tkptest_Init --
+  *
+  *	Defines commands that test platform specific functionality for
+  *	Unix platforms.
+  *
+  * Results:
+  *	A standard Tcl result.
+  *
+  * Side effects:
+  *	Defines new commands.
+  *
+  *----------------------------------------------------------------------
+  */
+ 
+ int
+ Tkptest_Init(
+     Tcl_Interp *interp)		/* Interpreter to add commands to. */
+ {
      /*
       * Add commands for platform specific tests on MacOS here.
       */
!     if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
! 	return TCL_ERROR;
!     }
!     if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) {
! 	return TCL_ERROR;
!     }
      Tcl_CreateCommand(interp, "testclipboard", TestclipboardCmd,
  	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
      Tcl_CreateCommand(interp, "testwinevent", TestwineventCmd,
