diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:37:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:37:08 (GMT) |
| commit | 5ed45c8735ed45385180fdf76546bf0dfacb6cd5 (patch) | |
| tree | 407017ea92745919245da494113d7c1733b41196 /generic/tclExecute.c | |
| parent | e2c9d2102f48da3b1ef994f059076ffbbb3d0781 (diff) | |
| parent | bf486a2007f9d3d45855d43e623ad85d29bcd0b7 (diff) | |
| download | tcl-5ed45c8735ed45385180fdf76546bf0dfacb6cd5.zip tcl-5ed45c8735ed45385180fdf76546bf0dfacb6cd5.tar.gz tcl-5ed45c8735ed45385180fdf76546bf0dfacb6cd5.tar.bz2 | |
Don't #define VOID on VxWorks, as it is already typdef'd to void. Eliminate possibly conflicting LOCAL/OFFSET
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 76fd71a..7c645e7 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -724,7 +724,7 @@ static Tcl_Obj ** GrowEvaluationStack(ExecEnv *eePtr, int growth, static void IllegalExprOperandType(Tcl_Interp *interp, const unsigned char *pc, Tcl_Obj *opndPtr); static void InitByteCodeExecution(Tcl_Interp *interp); -static inline int OFFSET(void *ptr); +static inline int wordSkip(void *ptr); static void ReleaseDictIterator(Tcl_Obj *objPtr); /* Useful elsewhere, make available in tclInt.h or stubs? */ static Tcl_Obj ** StackAllocWords(Tcl_Interp *interp, int numWords); @@ -1001,13 +1001,13 @@ TclFinalizeExecution(void) (TCL_ALLOCALIGN/sizeof(Tcl_Obj *)) /* - * OFFSET computes how many words have to be skipped until the next aligned + * wordSkip computes how many words have to be skipped until the next aligned * word. Note that we are only interested in the low order bits of ptr, so * that any possible information loss in PTR2INT is of no consequence. */ static inline int -OFFSET( +wordSkip( void *ptr) { int mask = TCL_ALLOCALIGN-1; @@ -1020,7 +1020,7 @@ OFFSET( */ #define MEMSTART(markerPtr) \ - ((markerPtr) + OFFSET(markerPtr)) + ((markerPtr) + wordSkip(markerPtr)) /* *---------------------------------------------------------------------- @@ -1065,7 +1065,7 @@ GrowEvaluationStack( } else { #ifndef PURIFY Tcl_Obj **tmpMarkerPtr = esPtr->tosPtr + 1; - int offset = OFFSET(tmpMarkerPtr); + int offset = wordSkip(tmpMarkerPtr); if (needed + offset < 0) { /* |