diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/dltest/pkga.c | 4 | ||||
| -rw-r--r-- | unix/dltest/pkgb.c | 20 | ||||
| -rw-r--r-- | unix/dltest/pkgc.c | 4 | ||||
| -rw-r--r-- | unix/dltest/pkgd.c | 4 | ||||
| -rw-r--r-- | unix/dltest/pkgooa.c | 8 | ||||
| -rw-r--r-- | unix/dltest/pkgua.c | 6 |
7 files changed, 34 insertions, 16 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index f6e442f..d0a9d86 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1039,9 +1039,9 @@ install-libraries: libraries do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \ done - @echo "Installing package http 2.10a3 as a Tcl Module" + @echo "Installing package http 2.10a4 as a Tcl Module" @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \ - "$(MODULE_INSTALL_DIR)/8.6/http-2.10a3.tm" + "$(MODULE_INSTALL_DIR)/8.6/http-2.10a4.tm" @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/" @for i in $(TOP_DIR)/library/opt/*.tcl; do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \ diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c index 37782ea..579c323 100644 --- a/unix/dltest/pkga.c +++ b/unix/dltest/pkga.c @@ -33,7 +33,7 @@ static int Pkga_EqObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -78,7 +78,7 @@ Pkga_EqObjCmd( static int Pkga_QuoteObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument strings. */ diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c index 2d525bc..e9645a4 100644 --- a/unix/dltest/pkgb.c +++ b/unix/dltest/pkgb.c @@ -37,7 +37,7 @@ static int Pkgb_SubObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -79,7 +79,7 @@ Pkgb_SubObjCmd( static int Pkgb_UnsafeObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -93,12 +93,24 @@ Pkgb_UnsafeObjCmd( static int Pkgb_DemoObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { - Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetEncodingSearchPath(), -1)); + Tcl_WideInt numChars; + int result; + (void)dummy; + + if (objc != 4) { + Tcl_WrongNumArgs(interp, 1, objv, "arg1 arg2 num"); + return TCL_ERROR; + } + if (Tcl_GetWideIntFromObj(interp, objv[3], &numChars) != TCL_OK) { + return TCL_ERROR; + } + result = Tcl_UtfNcmp(Tcl_GetString(objv[1]), Tcl_GetString(objv[2]), numChars); + Tcl_SetObjResult(interp, Tcl_NewIntObj(result)); return TCL_OK; } diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c index cd92cf7..8e9c829 100644 --- a/unix/dltest/pkgc.c +++ b/unix/dltest/pkgc.c @@ -33,7 +33,7 @@ static int Pkgc_SubObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -72,7 +72,7 @@ Pkgc_SubObjCmd( static int Pkgc_UnsafeObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c index 0c98ec4..1b97d4c 100644 --- a/unix/dltest/pkgd.c +++ b/unix/dltest/pkgd.c @@ -33,7 +33,7 @@ static int Pkgd_SubObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -72,7 +72,7 @@ Pkgd_SubObjCmd( static int Pkgd_UnsafeObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c index 5aa48a5..369d894 100644 --- a/unix/dltest/pkgooa.c +++ b/unix/dltest/pkgooa.c @@ -33,7 +33,7 @@ static int Pkgooa_StubsOKObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -88,6 +88,12 @@ static TclOOStubs stubsCopy = { #ifdef Tcl_MethodIsPrivate ,NULL #endif +#ifdef Tcl_GetClassOfObject + ,NULL +#endif +#ifdef Tcl_GetObjectClassName + ,NULL +#endif }; DLLEXPORT int diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c index 6d64352..16684a8 100644 --- a/unix/dltest/pkgua.c +++ b/unix/dltest/pkgua.c @@ -31,7 +31,7 @@ static Tcl_ThreadDataKey dataKey; #define MAX_REGISTERED_COMMANDS 2 static void -CommandDeleted(ClientData clientData) +CommandDeleted(void *clientData) { Tcl_Command *cmdToken = (Tcl_Command *)clientData; *cmdToken = NULL; @@ -120,7 +120,7 @@ PkguaDeleteTokens( static int PkguaEqObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -165,7 +165,7 @@ PkguaEqObjCmd( static int PkguaQuoteObjCmd( - ClientData dummy, /* Not used. */ + void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument strings. */ |