diff options
| author | welch <welch> | 1998-06-29 17:32:08 (GMT) |
|---|---|---|
| committer | welch <welch> | 1998-06-29 17:32:08 (GMT) |
| commit | 6cc4239d1928d436d3c8c3eb449661508ec0a17f (patch) | |
| tree | 9020e167a2bc306a9c861533ffdb4c7f2070939e /generic | |
| parent | 834bf0c2d0c47f3e16535483f56abbec82c04512 (diff) | |
| download | tcl-6cc4239d1928d436d3c8c3eb449661508ec0a17f.zip tcl-6cc4239d1928d436d3c8c3eb449661508ec0a17f.tar.gz tcl-6cc4239d1928d436d3c8c3eb449661508ec0a17f.tar.bz2 | |
Added Jans compatibility patch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 6 | ||||
| -rw-r--r-- | generic/tclBasic.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index ab7d032..eefe9f7 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -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. * - * SCCS: %Z% $Id: tcl.h,v 1.5 1998/06/15 12:33:20 suresh Exp $ + * SCCS: %Z% $Id: tcl.h,v 1.6 1998/06/29 17:32:08 welch Exp $ */ #ifndef _TCL @@ -967,6 +967,7 @@ typedef struct Tcl_ChannelType { Tcl_DriverGetHandleProc *getHandleProc; /* Get an OS handle from the channel * or NULL if not supported. */ + VOID *reserved; /* reserved for future expansion */ } Tcl_ChannelType; /* @@ -1172,7 +1173,8 @@ EXTERN int Tcl_EvalFile _ANSI_ARGS_((Tcl_Interp *interp, EXTERN void Tcl_EventuallyFree _ANSI_ARGS_((ClientData clientData, Tcl_FreeProc *freeProc)); EXTERN int Tcl_EvalObj _ANSI_ARGS_((Tcl_Interp *interp, - Tcl_Obj *objPtr)); + Tcl_Obj *objPtr, int flags)); +#define Tcl_EvalObj(a,b) Tcl_EvalObj(a,b,0) EXTERN void Tcl_Exit _ANSI_ARGS_((int status)); EXTERN int Tcl_ExposeCommand _ANSI_ARGS_((Tcl_Interp *interp, char *hiddenCmdToken, char *cmdName)); diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 4708212..40813ec 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.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. * - * SCCS: %Z% $Id: tclBasic.c,v 1.3 1998/06/10 12:06:58 escoffon Exp $ + * SCCS: %Z% $Id: tclBasic.c,v 1.4 1998/06/29 17:32:09 welch Exp $ */ #include "tclInt.h" @@ -2434,13 +2434,16 @@ Tcl_Eval(interp, string) *---------------------------------------------------------------------- */ +#undef Tcl_EvalObj + int -Tcl_EvalObj(interp, objPtr) +Tcl_EvalObj(interp, objPtr, dummy) Tcl_Interp *interp; /* Token for command interpreter * (returned by a previous call to * Tcl_CreateInterp). */ Tcl_Obj *objPtr; /* Pointer to object containing * commands to execute. */ + int dummy; /* not used */ { register Interp *iPtr = (Interp *) interp; int flags; /* Interp->evalFlags value when the @@ -3923,7 +3926,7 @@ Tcl_GlobalEvalObj(interp, objPtr) savedVarFramePtr = iPtr->varFramePtr; iPtr->varFramePtr = NULL; - result = Tcl_EvalObj(interp, objPtr); + result = Tcl_EvalObj(interp, objPtr, 0); iPtr->varFramePtr = savedVarFramePtr; return result; } |