diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:26:29 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:26:29 (GMT) |
commit | bf486a2007f9d3d45855d43e623ad85d29bcd0b7 (patch) | |
tree | 9b32f20f3f9f59fc35ff74967c61992a71b394ff /generic/tcl.h | |
parent | 2576405f10bb1194c302b2582428451d6f52d998 (diff) | |
parent | 349564d2ad254c318eb5f8ac46ef2597621cd4ee (diff) | |
download | tcl-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
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 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 /* |