summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-19 20:26:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-19 20:26:29 (GMT)
commitbf486a2007f9d3d45855d43e623ad85d29bcd0b7 (patch)
tree9b32f20f3f9f59fc35ff74967c61992a71b394ff
parent2576405f10bb1194c302b2582428451d6f52d998 (diff)
parent349564d2ad254c318eb5f8ac46ef2597621cd4ee (diff)
downloadtcl-bf486a2007f9d3d45855d43e623ad85d29bcd0b7.zip
tcl-bf486a2007f9d3d45855d43e623ad85d29bcd0b7.tar.gz
tcl-bf486a2007f9d3d45855d43e623ad85d29bcd0b7.tar.bz2
Don't #define VOID on VxWorks, as it is already typdef'd to void. Eliminate possibly conflicting LOCAL/OFFSET
-rw-r--r--generic/regguts.h6
-rw-r--r--generic/tcl.h10
-rw-r--r--generic/tclExecute.c8
3 files changed, 13 insertions, 11 deletions
diff --git a/generic/regguts.h b/generic/regguts.h
index bfa7921..42654eb 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -358,12 +358,12 @@ struct subre {
#define CAP 010 /* capturing parens below */
#define BACKR 020 /* back reference below */
#define INUSE 0100 /* in use in final tree */
-#define LOCAL 03 /* bits which may not propagate up */
+#define NOPROP 03 /* bits which may not propagate up */
#define LMIX(f) ((f)<<2) /* LONGER -> MIXED */
#define SMIX(f) ((f)<<1) /* SHORTER -> MIXED */
-#define UP(f) (((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED))
+#define UP(f) (((f)&~NOPROP) | (LMIX(f) & SMIX(f) & MIXED))
#define MESSY(f) ((f)&(MIXED|CAP|BACKR))
-#define PREF(f) ((f)&LOCAL)
+#define PREF(f) ((f)&NOPROP)
#define PREF2(f1, f2) ((PREF(f1) != 0) ? PREF(f1) : PREF(f2))
#define COMBINE(f1, f2) (UP((f1)|(f2)) | PREF2(f1, f2))
short retry; /* index into retry memory */
diff --git a/generic/tcl.h b/generic/tcl.h
index cb63d41..be5e697 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -293,10 +293,12 @@ typedef long LONG;
* in ANSI C; maps them to type "char *" in non-ANSI systems.
*/
-#ifndef NO_VOID
-#define VOID void
-#else
-#define VOID char
+#ifndef __VXWORKS__
+# ifndef NO_VOID
+# define VOID void
+# else
+# define VOID char
+# endif
#endif
/*
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 904c368..0de8e3c 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -836,13 +836,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;
@@ -855,7 +855,7 @@ OFFSET(
*/
#define MEMSTART(markerPtr) \
- ((markerPtr) + OFFSET(markerPtr))
+ ((markerPtr) + wordSkip(markerPtr))
/*
@@ -900,7 +900,7 @@ GrowEvaluationStack(
}
} else {
Tcl_Obj **tmpMarkerPtr = esPtr->tosPtr + 1;
- int offset = OFFSET(tmpMarkerPtr);
+ int offset = wordSkip(tmpMarkerPtr);
if (needed + offset < 0) {
/*