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 | 276bcea418a3db186a49c67505c81e5c8cf84b7b (patch) | |
tree | 407017ea92745919245da494113d7c1733b41196 /generic/tcl.h | |
parent | c0b55c5efdce5be6416a405e7f8dac1b4829aebd (diff) | |
parent | 1ac9419646cfa6a09fc0833febd11a0692bca193 (diff) | |
download | tcl-276bcea418a3db186a49c67505c81e5c8cf84b7b.zip tcl-276bcea418a3db186a49c67505c81e5c8cf84b7b.tar.gz tcl-276bcea418a3db186a49c67505c81e5c8cf84b7b.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/tcl.h')
-rw-r--r-- | generic/tcl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 4de18f0..d47e931 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -329,10 +329,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 /* |