summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-12-07 16:12:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-12-07 16:12:37 (GMT)
commit1fc4f8eaa3a46bc7ef6948a253d0064417ff214a (patch)
treec7abd1017a8bf00fed8f33378ab350989c77a567 /unix
parent70bccae3346a29895b6ec49100954b72bbeb9630 (diff)
parent2adea0d04ed81999f4c9a17f387a02c92203843a (diff)
downloadtcl-1fc4f8eaa3a46bc7ef6948a253d0064417ff214a.zip
tcl-1fc4f8eaa3a46bc7ef6948a253d0064417ff214a.tar.gz
tcl-1fc4f8eaa3a46bc7ef6948a253d0064417ff214a.tar.bz2
merge trunk
Diffstat (limited to 'unix')
-rw-r--r--unix/dltest/pkgb.c26
1 files changed, 24 insertions, 2 deletions
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 969401b..2f65536 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -21,6 +21,8 @@ static int Pkgb_SubObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
static int Pkgb_UnsafeObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+static int Pkgb_DemoObjCmd(ClientData clientData,
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
/*
*----------------------------------------------------------------------
@@ -86,6 +88,26 @@ Pkgb_UnsafeObjCmd(
{
return Tcl_EvalEx(interp, "list unsafe command invoked", -1, TCL_EVAL_GLOBAL);
}
+
+#if (TCL_MAJOR_VERSION > 8)
+# define Tcl_GetDefaultEncodingDir ((const char *(*)(void)) \
+ ((&(tclStubsPtr->tcl_PkgProvideEx))[341]))
+#endif
+
+static int
+Pkgb_DemoObjCmd(
+ ClientData dummy, /* Not used. */
+ Tcl_Interp *interp, /* Current interpreter. */
+ int objc, /* Number of arguments. */
+ Tcl_Obj *const objv[]) /* Argument objects. */
+{
+ if(!Tcl_GetDefaultEncodingDir) {
+ Tcl_SetObjResult(interp, Tcl_NewStringObj("not supported", -1));
+ return TCL_ERROR;
+ }
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetDefaultEncodingDir(), -1));
+ return TCL_OK;
+}
/*
*----------------------------------------------------------------------
@@ -119,8 +141,8 @@ Pkgb_Init(
return code;
}
Tcl_CreateObjCommand(interp, "pkgb_sub", Pkgb_SubObjCmd, NULL, NULL);
- Tcl_CreateObjCommand(interp, "pkgb_unsafe", Pkgb_UnsafeObjCmd, NULL,
- NULL);
+ Tcl_CreateObjCommand(interp, "pkgb_unsafe", Pkgb_UnsafeObjCmd, NULL, NULL);
+ Tcl_CreateObjCommand(interp, "pkgb_demo", Pkgb_DemoObjCmd, NULL, NULL);
return TCL_OK;
}