From 1aa76109883bcf6ea698357e30fb0957582cfecf Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 7 Dec 2012 14:53:40 +0000
Subject: Extended test of [load]ing Tcl 8 compiled extension into Tcl 9
 interp.

---
 unix/dltest/pkgb.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 02bd233..9c199ca 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -30,6 +30,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[]);
 
 /*
  *----------------------------------------------------------------------
@@ -95,6 +97,17 @@ Pkgb_UnsafeObjCmd(
 {
     return Tcl_EvalEx(interp, "list unsafe command invoked", -1, TCL_EVAL_GLOBAL);
 }
+
+static int
+Pkgb_DemoObjCmd(
+    ClientData dummy,		/* Not used. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    const char *foo = Tcl_GetDefaultEncodingDir();
+    return TCL_OK;
+}
 
 /*
  *----------------------------------------------------------------------
@@ -128,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;
 }
 
-- 
cgit v0.12


From f894c98ebcf5695143cef51efbab713e1640c8b4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Dec 2012 15:51:25 +0000
Subject: add proper runtime-detection to pkgb.so

---
 unix/dltest/pkgb.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 9c199ca..1a362ef 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -98,6 +98,11 @@ 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. */
@@ -105,7 +110,11 @@ Pkgb_DemoObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    const char *foo = Tcl_GetDefaultEncodingDir();
+    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;
 }
 
-- 
cgit v0.12


From 7720b5d9dfd50b78eac3ffe28edc45adcd163c37 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Dec 2012 15:53:29 +0000
Subject: fix failing test

---
 tests/load.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/load.test b/tests/load.test
index eef677f..cded85d 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -188,7 +188,7 @@ test load-8.3 {TclGetLoadedPackages procedure} [list teststaticpkg $dll $loaded]
 test load-8.4 {TclGetLoadedPackages procedure} [list $dll $loaded teststaticpkg] {
     load [file join $testDir pkgb$ext] pkgb
     list [info loaded {}] [lsort [info commands pkgb_*]]
-} [list [concat [list [list [file join $testDir pkgb$ext] Pkgb] {{} Double} {{} More} {{} Another} {{} Test} [list [file join $testDir pkga$ext] Pkga]] $alreadyLoaded] {pkgb_sub pkgb_unsafe}]
+} [list [concat [list [list [file join $testDir pkgb$ext] Pkgb] {{} Double} {{} More} {{} Another} {{} Test} [list [file join $testDir pkga$ext] Pkga]] $alreadyLoaded] {pkgb_demo pkgb_sub pkgb_unsafe}]
 interp delete child
 
 test load-9.1 {Tcl_StaticPackage, load already-loaded package into another interp} \
-- 
cgit v0.12


From 2adea0d04ed81999f4c9a17f387a02c92203843a Mon Sep 17 00:00:00 2001
From: mig <mig>
Date: Fri, 7 Dec 2012 15:56:13 +0000
Subject: small correction in doc/NRE.3

---
 doc/NRE.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/NRE.3 b/doc/NRE.3
index be2c58b..4ad78b3 100644
--- a/doc/NRE.3
+++ b/doc/NRE.3
@@ -295,7 +295,7 @@ int
     int result)
 {
     /* \fIdata[0] .. data[3]\fR are the four words of data
-     * passed to \fBTcl_NREvalObj\fR */
+     * passed to \fBTcl_NRAddCallback\fR */
 
     \fI... postprocessing ...\fR
 
-- 
cgit v0.12