summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-11-19 23:45:08 (GMT)
committernijtmans <nijtmans>2009-11-19 23:45:08 (GMT)
commit930fbd756216e095a887d89e631cc699a97406bf (patch)
treeae364155226308454d7c9368c5364a9f4ac440a5 /generic
parentb36e07917dbad9ecfad09b3941e0aabbdc9f3747 (diff)
downloadtk-930fbd756216e095a887d89e631cc699a97406bf.zip
tk-930fbd756216e095a887d89e631cc699a97406bf.tar.gz
tk-930fbd756216e095a887d89e631cc699a97406bf.tar.bz2
Compile tkTest.c and friends with Stubs
Diffstat (limited to 'generic')
-rw-r--r--generic/tkOldTest.c8
-rw-r--r--generic/tkSquare.c8
-rw-r--r--generic/tkTest.c24
3 files changed, 37 insertions, 3 deletions
diff --git a/generic/tkOldTest.c b/generic/tkOldTest.c
index 3d17686..280b088 100644
--- a/generic/tkOldTest.c
+++ b/generic/tkOldTest.c
@@ -14,10 +14,16 @@
* 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.4 2008/11/03 22:20:22 nijtmans Exp $
+ * RCS: @(#) $Id: tkOldTest.c,v 1.5 2009/11/19 23:45:08 nijtmans Exp $
*/
#define USE_OLD_IMAGE
+#ifndef USE_TCL_STUBS
+# define USE_TCL_STUBS
+#endif
+#ifndef USE_TK_STUBS
+# define USE_TK_STUBS
+#endif
#include "tkInt.h"
/*
diff --git a/generic/tkSquare.c b/generic/tkSquare.c
index 50292d1..5446413 100644
--- a/generic/tkSquare.c
+++ b/generic/tkSquare.c
@@ -12,12 +12,18 @@
* 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.13 2008/10/17 23:18:37 nijtmans Exp $
+ * RCS: @(#) $Id: tkSquare.c,v 1.14 2009/11/19 23:45:08 nijtmans Exp $
*/
#if 0
#define __NO_OLD_CONFIG
#endif
+#ifndef USE_TCL_STUBS
+# define USE_TCL_STUBS
+#endif
+#ifndef USE_TK_STUBS
+# define USE_TK_STUBS
+#endif
#include "tkInt.h"
/*
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 22879ee..b90d689 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -13,9 +13,15 @@
* 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.42 2009/09/07 07:29:04 das Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.43 2009/11/19 23:45:08 nijtmans Exp $
*/
+#ifndef USE_TCL_STUBS
+# define USE_TCL_STUBS
+#endif
+#ifndef USE_TK_STUBS
+# define USE_TK_STUBS
+#endif
#include "tkInt.h"
#include "tkText.h"
@@ -33,6 +39,15 @@
#endif
/*
+ * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
+ * Tcltest_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
+EXTERN int Tktest_Init(Tcl_Interp *interp);
+/*
* The following data structure represents the master for a test image:
*/
@@ -241,6 +256,13 @@ Tktest_Init(
{
static int initialized = 0;
+ if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+ return TCL_ERROR;
+ }
+ if (Tk_InitStubs(interp, "8.1", 0) == NULL) {
+ return TCL_ERROR;
+ }
+
/*
* Create additional commands for testing Tk.
*/