Make all internal initialization

routines MODULE_SCOPE
copy win/tcl.m4 from Tcl (latest) to Tk
and regenerate win/configure

4 files changed, 18 insertions, 32 deletions

diff --git a/generic/tkInt.h b/generic/tkInt.h
index 6f85485..b806dea 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: $Id: tkInt.h,v 1.111 2009/09/07 06:20:50 das Exp $
+ * RCS: $Id: tkInt.h,v 1.112 2009/11/29 22:10:36 nijtmans Exp $
  */
 
 #ifndef _TKINT
@@ -1225,6 +1225,19 @@ MODULE_SCOPE int	TkUnsupported1ObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 
+/*
+ * For Tktest.
+ */
+MODULE_SCOPE int SquareObjCmd(ClientData clientData,
+			    Tcl_Interp *interp, int objc,
+			    Tcl_Obj * const objv[]);
+MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#define TkplatformtestInit(x) TCL_OK
+#else
+MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
+#endif
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
diff --git a/generic/tkOldTest.c b/generic/tkOldTest.c
index 280b088..c701899 100644
--- a/generic/tkOldTest.c
+++ b/generic/tkOldTest.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkOldTest.c,v 1.5 2009/11/19 23:45:08 nijtmans Exp $
+ * RCS: @(#) $Id: tkOldTest.c,v 1.6 2009/11/29 22:10:36 nijtmans Exp $
  */
 
 #define USE_OLD_IMAGE
@@ -84,7 +84,6 @@ static Tk_ImageType imageType = {
 
 static int              ImageCmd(ClientData dummy,
                             Tcl_Interp *interp, int argc, const char **argv);
-MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
 
 
 /*
diff --git a/generic/tkSquare.c b/generic/tkSquare.c
index 5446413..4d2aca6 100644
--- a/generic/tkSquare.c
+++ b/generic/tkSquare.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkSquare.c,v 1.14 2009/11/19 23:45:08 nijtmans Exp $
+ * RCS: @(#) $Id: tkSquare.c,v 1.15 2009/11/29 22:10:36 nijtmans Exp $
  */
 
 #if 0
@@ -98,9 +98,6 @@ static const Tk_OptionSpec optionSpecs[] = {
  * Forward declarations for procedures defined later in this file:
  */
 
-int			SquareObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj * const objv[]);
 static void		SquareDeletedProc(ClientData clientData);
 static int		SquareConfigure(Tcl_Interp *interp, Square *squarePtr);
 static void		SquareDestroy(char *memPtr);
diff --git a/generic/tkTest.c b/generic/tkTest.c
index b90d689..451970c 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -13,9 +13,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTest.c,v 1.43 2009/11/19 23:45:08 nijtmans Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.44 2009/11/29 22:10:36 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #ifndef USE_TCL_STUBS
 #   define USE_TCL_STUBS
 #endif
@@ -112,14 +113,6 @@ typedef struct NewApp {
 
 static NewApp *newAppPtr = NULL;/* First in list of all new interpreters. */
 
-/*
- * Declaration for the square widget's class command function:
- */
-
-extern int		SquareObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj * const objv[]);
-
 typedef struct CBinding {
     Tcl_Interp *interp;
     char *command;
@@ -157,7 +150,6 @@ static int		CBindingEvalProc(ClientData clientData,
 			    Tcl_Interp *interp, XEvent *eventPtr,
 			    Tk_Window tkwin, KeySym keySym);
 static void		CBindingFreeProc(ClientData clientData);
-int			Tktest_Init(Tcl_Interp *interp);
 static int		ImageCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestcbindCmd(ClientData dummy,
@@ -217,21 +209,6 @@ static int		TrivialConfigObjCmd(ClientData dummy,
 			    Tcl_Obj * const objv[]);
 static void		TrivialEventProc(ClientData clientData,
 			    XEvent *eventPtr);
-
-/*
- * External (platform specific) initialization routine:
- */
-
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
-#define TkplatformtestInit(x) TCL_OK
-#else
-MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
-#endif
-
-/*
- * External legacy testing initialization routine:
- */
-MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
 
 /*
  *----------------------------------------------------------------------