diff options
| author | davygrvy <davygrvy@pobox.com> | 2004-10-28 04:52:53 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2004-10-28 04:52:53 (GMT) |
| commit | 5e37a9c86cca817c60268a18063c326520f24480 (patch) | |
| tree | a7939d6cd224d673b8151a533b7821d85b596256 | |
| parent | d7ff3329f865713723d696c68a3bbde36ca6a7fe (diff) | |
| download | tcl-5e37a9c86cca817c60268a18063c326520f24480.zip tcl-5e37a9c86cca817c60268a18063c326520f24480.tar.gz tcl-5e37a9c86cca817c60268a18063c326520f24480.tar.bz2 | |
* unix/tclAppInit.c: When built as tcltest, TclThread_Init was getting called
* win/tclAppInit.c: twice. First by TclTest_Init, then again in Tcl_AppInit.
The call from Tcl_AppInit now removed.
| -rw-r--r-- | unix/tclAppInit.c | 18 | ||||
| -rw-r--r-- | win/tclAppInit.c | 21 |
2 files changed, 11 insertions, 28 deletions
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c index 3c47a39..dd83707 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.11 2002/05/31 22:20:22 dgp Exp $ + * RCS: @(#) $Id: tclAppInit.c,v 1.12 2004/10/28 04:52:53 davygrvy Exp $ */ #include "tcl.h" @@ -20,13 +20,10 @@ #include "tclInt.h" -extern int Procbodytest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -extern int Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp *interp)); -extern int TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -extern int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -#ifdef TCL_THREADS -extern int TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp)); -#endif +extern Tcl_PackageInitProc Procbodytest_Init; +extern Tcl_PackageInitProc Procbodytest_SafeInit; +extern Tcl_PackageInitProc TclObjTest_Init; +extern Tcl_PackageInitProc Tcltest_Init; #endif /* TCL_TEST */ @@ -133,11 +130,6 @@ Tcl_AppInit(interp) if (TclObjTest_Init(interp) == TCL_ERROR) { return TCL_ERROR; } -#ifdef TCL_THREADS - if (TclThread_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } -#endif if (Procbodytest_Init(interp) == TCL_ERROR) { return TCL_ERROR; } diff --git a/win/tclAppInit.c b/win/tclAppInit.c index b6a72f7..b7bcc30 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.20 2004/09/18 22:01:36 davygrvy Exp $ + * RCS: @(#) $Id: tclAppInit.c,v 1.21 2004/10/28 04:53:42 davygrvy Exp $ */ #include "tcl.h" @@ -19,13 +19,10 @@ #include <locale.h> #ifdef TCL_TEST -extern int Procbodytest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -extern int Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp *interp)); -extern int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -extern int TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp)); -#ifdef TCL_THREADS -extern int TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp)); -#endif +extern Tcl_PackageInitProc Procbodytest_Init; +extern Tcl_PackageInitProc Procbodytest_SafeInit; +extern Tcl_PackageInitProc Tcltest_Init; +extern Tcl_PackageInitProc TclObjTest_Init; #endif /* TCL_TEST */ #if defined(__GNUC__) @@ -155,16 +152,10 @@ Tcl_AppInit(interp) if (Tcltest_Init(interp) == TCL_ERROR) { return TCL_ERROR; } - Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, - (Tcl_PackageInitProc *) NULL); + Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, NULL); if (TclObjTest_Init(interp) == TCL_ERROR) { return TCL_ERROR; } -#ifdef TCL_THREADS - if (TclThread_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } -#endif if (Procbodytest_Init(interp) == TCL_ERROR) { return TCL_ERROR; } |