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/tcl.h | |
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/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 /* |