diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-04-12 07:26:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-04-12 07:26:02 (GMT) |
| commit | 44b8ca4b32de8e867a95d44d64c6445d6a6bc389 (patch) | |
| tree | 79664d7385677d3f885b546236251724da1cc533 /unix | |
| parent | 084e0e3592fe3bef1db12395401090e9d317c590 (diff) | |
| parent | 8ffd9ec61e651bc933eb844c13a99927543bf8f4 (diff) | |
| download | tcl-44b8ca4b32de8e867a95d44d64c6445d6a6bc389.zip tcl-44b8ca4b32de8e867a95d44d64c6445d6a6bc389.tar.gz tcl-44b8ca4b32de8e867a95d44d64c6445d6a6bc389.tar.bz2 | |
revert 6b6ef4e0b1, removing the temporary tests again
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/dltest/pkga.c | 17 | ||||
| -rw-r--r-- | unix/dltest/pkgua.c | 13 | ||||
| -rw-r--r-- | unix/tclAppInit.c | 8 |
3 files changed, 2 insertions, 36 deletions
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c index a014458..c4d3f32 100644 --- a/unix/dltest/pkga.c +++ b/unix/dltest/pkga.c @@ -29,17 +29,6 @@ static int Pkga_EqObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int Pkga_QuoteObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -/* - * Function to be backlinked from the tcltest executable - */ -#if 0 -extern const char *Tcltest_Foo(); -#else -EXTERN const char *Tcltest_Foo() { - return "I'm in pkga.c"; -} -#endif - /* *---------------------------------------------------------------------- @@ -110,15 +99,11 @@ Pkga_QuoteObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument strings. */ { - if (objc > 2) { + if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "value"); return TCL_ERROR; } - if (objc == 1) { - Tcl_SetResult(interp, (char *) Tcltest_Foo(), TCL_VOLATILE); - } else { Tcl_SetObjResult(interp, objv[1]); - } return TCL_OK; } diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c index b022c3c..417bedb 100644 --- a/unix/dltest/pkgua.c +++ b/unix/dltest/pkgua.c @@ -13,7 +13,6 @@ #undef STATIC_BUILD #include "tcl.h" -#include <stdio.h> /* * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the @@ -176,21 +175,11 @@ PkguaQuoteObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument strings. */ { - if (objc > 2) { + if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "value"); return TCL_ERROR; } - if (objc == 1) { - int major, minor, patch, type; - char result[128]; - -#undef Tcl_GetVersion /* Link this symbol without stubs */ - Tcl_GetVersion(&major, &minor, &patch, &type); - sprintf(result, "%d %d %d %d", major, minor, patch, type); - Tcl_SetResult(interp, result, TCL_VOLATILE); - } else { Tcl_SetObjResult(interp, objv[1]); - } return TCL_OK; } diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c index 910a233..0d2a6c4 100644 --- a/unix/tclAppInit.c +++ b/unix/tclAppInit.c @@ -154,14 +154,6 @@ Tcl_AppInit( return TCL_OK; } - -#ifdef TCL_TEST -# undef TCL_STORAGE_CLASS -# define TCL_STORAGE_CLASS DLLEXPORT -EXTERN const char *Tcltest_Foo() { - return "I'm in tclAppInit.c"; -} -#endif /* TCL_TEST */ /* * Local Variables: |