summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-19 14:04:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-19 14:04:07 (GMT)
commit349564d2ad254c318eb5f8ac46ef2597621cd4ee (patch)
tree00a19b21090ebca17a99622ec6876237179c0427
parent0381a0636d9cf0732c403ff31d13a8585fffdbfd (diff)
downloadtcl-349564d2ad254c318eb5f8ac46ef2597621cd4ee.zip
tcl-349564d2ad254c318eb5f8ac46ef2597621cd4ee.tar.gz
tcl-349564d2ad254c318eb5f8ac46ef2597621cd4ee.tar.bz2
Don't #define VOID on VxWorks, as it is already typdef'd to void
Eliminate possibly conflicting LOCAL #define
-rw-r--r--generic/regguts.h6
-rw-r--r--generic/tcl.h10
2 files changed, 9 insertions, 7 deletions
diff --git a/generic/regguts.h b/generic/regguts.h
index ee5c596..b33753c 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -378,12 +378,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 5f47734..466ddcc 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -294,10 +294,12 @@ typedef long LONG;
* 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
/*