summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-09-23 21:40:45 (GMT)
committernijtmans <nijtmans>2010-09-23 21:40:45 (GMT)
commita186bdb4397f2d831f6bb04e453fdf14e21c9c97 (patch)
tree1a72c5d9af6e0014b67853684fda5e42710dcef6
parent8691a6254e1afce0248c4ff5807236e23e1167a0 (diff)
downloadtcl-a186bdb4397f2d831f6bb04e453fdf14e21c9c97.zip
tcl-a186bdb4397f2d831f6bb04e453fdf14e21c9c97.tar.gz
tcl-a186bdb4397f2d831f6bb04e453fdf14e21c9c97.tar.bz2
Make Tcl_SetPanicProc and Tcl_GetStringResult callable without stubs, just as Tcl_SetVar.
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclDecls.h6
-rw-r--r--unix/tclAppInit.c4
-rw-r--r--win/tclAppInit.c4
4 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5601843..7822654 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-23 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclDecls.h: Make Tcl_SetPanicProc and Tcl_GetStringResult
+ * unix/tclAppInit.c: callable without stubs, just as Tcl_SetVar.
+ * win/tclAppInit.c:
+
2010-09-23 Don Porter <dgp@users.sourceforge.net>
* generic/tclCmdAH.c: Fix cases where value returned by
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 675f383..fc9e082 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclDecls.h,v 1.186 2010/09/16 14:49:37 nijtmans Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.187 2010/09/23 21:40:46 nijtmans Exp $
*/
#ifndef _TCLDECLS
@@ -3774,12 +3774,16 @@ extern const TclStubs *tclStubsPtr;
#if defined(USE_TCL_STUBS)
# undef Tcl_CreateInterp
# undef Tcl_FindExecutable
+# undef Tcl_GetStringResult
# undef Tcl_Init
+# undef Tcl_SetPanicProc
# undef Tcl_SetVar
# undef Tcl_StaticPackage
# undef TclFSGetNativePath
# define Tcl_CreateInterp() (tclStubsPtr->tcl_CreateInterp())
+# define Tcl_GetStringResult(interp) (tclStubsPtr->tcl_GetStringResult(interp))
# define Tcl_Init(interp) (tclStubsPtr->tcl_Init(interp))
+# define Tcl_SetPanicProc(proc) (tclStubsPtr->tcl_SetPanicProc(proc))
# define Tcl_SetVar(interp, varName, newValue, flags) \
(tclStubsPtr->tcl_SetVar(interp, varName, newValue, flags))
#endif
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 297a83a..a74fec8 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.23 2010/09/23 09:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.24 2010/09/23 21:40:46 nijtmans Exp $
*/
#include "tcl.h"
@@ -104,7 +104,7 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
- if (Tcl_Init(interp) == TCL_ERROR) {
+ if ((Tcl_Init)(interp) == TCL_ERROR) {
return TCL_ERROR;
}
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 2db61b0..48962c0 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -12,7 +12,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.32 2010/09/23 09:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.33 2010/09/23 21:40:45 nijtmans Exp $
*/
/* TODO: This file does not compile in UNICODE mode.
@@ -139,7 +139,7 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
- if (Tcl_Init(interp) == TCL_ERROR) {
+ if ((Tcl_Init)(interp) == TCL_ERROR) {
return TCL_ERROR;
}