summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-28 08:29:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-28 08:29:35 (GMT)
commitd26dbcc674a5cac3ff627bf6fde8f8423cb15759 (patch)
treef08644fdd361765ac6483ac3eff46d5ebfa2cc27
parent8a493825aa6a54ea7dcbe527b1cbb72cd38d7598 (diff)
downloadtcl-d26dbcc674a5cac3ff627bf6fde8f8423cb15759.zip
tcl-d26dbcc674a5cac3ff627bf6fde8f8423cb15759.tar.gz
tcl-d26dbcc674a5cac3ff627bf6fde8f8423cb15759.tar.bz2
Allow Tcl to be compiled even if Tcl_Eval, Tcl_GetVar, ... are macros.
-rw-r--r--generic/tclBasic.c4
-rw-r--r--generic/tclIndexObj.c1
-rw-r--r--generic/tclObj.c7
-rw-r--r--generic/tclPkg.c3
-rw-r--r--generic/tclResult.c3
-rw-r--r--generic/tclStubInit.c1
-rw-r--r--generic/tclTrace.c1
-rw-r--r--generic/tclVar.c4
8 files changed, 22 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 4d5b715..f57b4ea 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5811,6 +5811,7 @@ TclArgumentGet(
*----------------------------------------------------------------------
*/
+#undef Tcl_Eval
int
Tcl_Eval(
Tcl_Interp *interp, /* Token for command interpreter (returned by
@@ -6774,6 +6775,7 @@ Tcl_AppendObjToErrorInfo(
*----------------------------------------------------------------------
*/
+#undef Tcl_AddErrorInfo
void
Tcl_AddErrorInfo(
Tcl_Interp *interp, /* Interpreter to which error information
@@ -6804,6 +6806,7 @@ Tcl_AddErrorInfo(
*----------------------------------------------------------------------
*/
+#undef Tcl_AddObjErrorInfo
void
Tcl_AddObjErrorInfo(
Tcl_Interp *interp, /* Interpreter to which error information
@@ -6954,6 +6957,7 @@ Tcl_VarEval(
*----------------------------------------------------------------------
*/
+#undef Tcl_GlobalEval
int
Tcl_GlobalEval(
Tcl_Interp *interp, /* Interpreter in which to evaluate
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 29cdbbb..ce8b9fb 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -101,6 +101,7 @@ typedef struct {
*----------------------------------------------------------------------
*/
+#undef Tcl_GetIndexFromObj
int
Tcl_GetIndexFromObj(
Tcl_Interp *interp, /* Used for error reporting if not NULL. */
diff --git a/generic/tclObj.c b/generic/tclObj.c
index a40a29d..54ec25a 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1733,8 +1733,8 @@ Tcl_InvalidateStringRep(
*----------------------------------------------------------------------
*/
-#ifdef TCL_MEM_DEBUG
#undef Tcl_NewBooleanObj
+#ifdef TCL_MEM_DEBUG
Tcl_Obj *
Tcl_NewBooleanObj(
@@ -1782,6 +1782,7 @@ Tcl_NewBooleanObj(
*----------------------------------------------------------------------
*/
+#undef Tcl_DbNewBooleanObj
#ifdef TCL_MEM_DEBUG
Tcl_Obj *
@@ -1834,6 +1835,7 @@ Tcl_DbNewBooleanObj(
*----------------------------------------------------------------------
*/
+#undef Tcl_SetBooleanObj
void
Tcl_SetBooleanObj(
register Tcl_Obj *objPtr, /* Object whose internal rep to init. */
@@ -2393,8 +2395,8 @@ UpdateStringOfDouble(
*----------------------------------------------------------------------
*/
-#ifdef TCL_MEM_DEBUG
#undef Tcl_NewIntObj
+#ifdef TCL_MEM_DEBUG
Tcl_Obj *
Tcl_NewIntObj(
@@ -2434,6 +2436,7 @@ Tcl_NewIntObj(
*----------------------------------------------------------------------
*/
+#undef Tcl_SetIntObj
void
Tcl_SetIntObj(
register Tcl_Obj *objPtr, /* Object whose internal rep to init. */
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 5b09ddb..07f62a4 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -106,6 +106,7 @@ static const char * PkgRequireCore(Tcl_Interp *interp, const char *name,
*----------------------------------------------------------------------
*/
+#undef Tcl_PkgProvide
int
Tcl_PkgProvide(
Tcl_Interp *interp, /* Interpreter in which package is now
@@ -188,6 +189,7 @@ Tcl_PkgProvideEx(
*----------------------------------------------------------------------
*/
+#undef Tcl_PkgRequire
const char *
Tcl_PkgRequire(
Tcl_Interp *interp, /* Interpreter in which package is now
@@ -670,6 +672,7 @@ PkgRequireCore(
*----------------------------------------------------------------------
*/
+#undef Tcl_PkgPresent
const char *
Tcl_PkgPresent(
Tcl_Interp *interp, /* Interpreter in which package is now
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 07f6819..014ea1b 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -230,6 +230,7 @@ Tcl_DiscardInterpState(
*----------------------------------------------------------------------
*/
+#undef Tcl_SaveResult
void
Tcl_SaveResult(
Tcl_Interp *interp, /* Interpreter to save. */
@@ -304,6 +305,7 @@ Tcl_SaveResult(
*----------------------------------------------------------------------
*/
+#undef Tcl_RestoreResult
void
Tcl_RestoreResult(
Tcl_Interp *interp, /* Interpreter being restored. */
@@ -372,6 +374,7 @@ Tcl_RestoreResult(
*----------------------------------------------------------------------
*/
+#undef Tcl_DiscardResult
void
Tcl_DiscardResult(
Tcl_SavedResult *statePtr) /* State returned by Tcl_SaveResult. */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 1dbdc09..8bf4f9d 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -42,6 +42,7 @@
#undef TclpGetPid
#undef TclSockMinimumBuffers
#define TclBackgroundException Tcl_BackgroundException
+#undef Tcl_SetIntObj
/* See bug 510001: TclSockMinimumBuffers needs plat imp */
#ifdef _WIN64
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 73e7c66..c0cde49 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -3093,6 +3093,7 @@ Tcl_VarTraceInfo2(
*----------------------------------------------------------------------
*/
+#undef Tcl_TraceVar
int
Tcl_TraceVar(
Tcl_Interp *interp, /* Interpreter in which variable is to be
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 39a1d5f..af1a563 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -1247,6 +1247,7 @@ TclLookupArrayElement(
*----------------------------------------------------------------------
*/
+#undef Tcl_GetVar
const char *
Tcl_GetVar(
Tcl_Interp *interp, /* Command interpreter in which varName is to
@@ -1589,6 +1590,7 @@ Tcl_SetObjCmd(
*----------------------------------------------------------------------
*/
+#undef Tcl_SetVar
const char *
Tcl_SetVar(
Tcl_Interp *interp, /* Command interpreter in which varName is to
@@ -2191,6 +2193,7 @@ TclPtrIncrObjVar(
*----------------------------------------------------------------------
*/
+#undef Tcl_UnsetVar
int
Tcl_UnsetVar(
Tcl_Interp *interp, /* Command interpreter in which varName is to
@@ -4550,6 +4553,7 @@ TclPtrObjMakeUpvar(
*----------------------------------------------------------------------
*/
+#undef Tcl_UpVar
int
Tcl_UpVar(
Tcl_Interp *interp, /* Command interpreter in which varName is to