summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-11-19 16:31:10 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-11-19 16:31:10 (GMT)
commit9d243a7d2ffa0988a6dc1316cecf69e776b75bae (patch)
treea0d1e181aff1565c56f901c29f22de688b0239f3
parent2eb0767336c873190979f8ab18ddd613b21af518 (diff)
downloadtcl-9d243a7d2ffa0988a6dc1316cecf69e776b75bae.zip
tcl-9d243a7d2ffa0988a6dc1316cecf69e776b75bae.tar.gz
tcl-9d243a7d2ffa0988a6dc1316cecf69e776b75bae.tar.bz2
* unix/tclAppInit.c: Repair broken build of the tcltest executable.
* win/tclAppInit.c: [Bug 2883850, 2900542].
-rw-r--r--ChangeLog5
-rw-r--r--unix/tclAppInit.c6
-rw-r--r--win/tclAppInit.c16
3 files changed, 11 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 35f9302..b14de54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-19 Don Porter <dgp@users.sourceforge.net>
+
+ * unix/tclAppInit.c: Repair broken build of the tcltest executable.
+ * win/tclAppInit.c: [Bug 2883850, 2900542].
+
2009-11-19 Donal K. Fellows <dkf@users.sf.net>
* library/auto.tcl (tcl_findLibrary):
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 7d8e1c0..a39b448 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -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: tclAppInit.c,v 1.19 2009/11/18 23:46:05 nijtmans Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.20 2009/11/19 16:31:10 dgp Exp $
*/
#include "tcl.h"
@@ -21,6 +21,7 @@
#include "tclInt.h"
extern Tcl_PackageInitProc Tcltest_Init;
+extern Tcl_PackageInitProc Tcltest_SafeInit;
#endif /* TCL_TEST */
@@ -122,8 +123,7 @@ Tcl_AppInit(
if (Tcltest_Init(interp) == TCL_ERROR) {
return TCL_ERROR;
}
- Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
- (Tcl_PackageInitProc *) Tcltest_SafeInit);
+ Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit);
#endif /* TCL_TEST */
/*
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index b5e5729..99609ab 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -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: tclAppInit.c,v 1.27 2009/01/09 11:21:46 dkf Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.28 2009/11/19 16:31:11 dgp Exp $
*/
#include "tcl.h"
@@ -19,10 +19,8 @@
#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;
+extern Tcl_PackageInitProc Tcltest_SafeInit;
#endif /* TCL_TEST */
#if defined(__GNUC__)
@@ -135,15 +133,7 @@ Tcl_AppInit(
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);
+ Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit);
#endif /* TCL_TEST */
#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES