diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-07-05 19:46:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-07-05 19:46:24 (GMT) |
| commit | 64cbe6e187a319a8a9cef0d6201f22ba68a7ed60 (patch) | |
| tree | f0c4a30723a733019a938b2abae628ceea38d62e | |
| parent | 6982ae0ca7a42a53c0fbdf2fddf9296537b7bfa0 (diff) | |
| parent | 367ce9ad482394057c4d895abb67ffe50f1ac015 (diff) | |
| download | tcl-64cbe6e187a319a8a9cef0d6201f22ba68a7ed60.zip tcl-64cbe6e187a319a8a9cef0d6201f22ba68a7ed60.tar.gz tcl-64cbe6e187a319a8a9cef0d6201f22ba68a7ed60.tar.bz2 | |
Merge 8.6. Also remove a useless #undef/#define which will be overrided later.
| -rw-r--r-- | generic/tclDecls.h | 3 | ||||
| -rw-r--r-- | generic/tclDictObj.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 3f7f343..7732ae6 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3834,15 +3834,12 @@ extern const TclStubs *tclStubsPtr; # undef Tcl_GetStringResult # undef Tcl_Init # undef Tcl_SetPanicProc -# undef Tcl_SetVar # undef Tcl_ObjSetVar2 # undef Tcl_StaticPackage # 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)) # define Tcl_ObjSetVar2(interp, part1, part2, newValue, flags) \ (tclStubsPtr->tcl_ObjSetVar2(interp, part1, part2, newValue, flags)) #endif diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index a0f6491..1d952ec 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -153,7 +153,7 @@ typedef struct Dict { * must be assignable as well as readable. */ -#define DICT(dictObj) (*((Dict **)&(dictObj)->internalRep.twoPtrValue.ptr1)) +#define DICT(dictObj) ((dictObj)->internalRep.twoPtrValue.ptr1) /* * The structure below defines the dictionary object type by means of |