diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-05-19 20:26:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-05-19 20:26:29 (GMT) |
| commit | 1b524a79cd345ead93435990edd1f04dcf71c9ad (patch) | |
| tree | 9b32f20f3f9f59fc35ff74967c61992a71b394ff /generic/tcl.h | |
| parent | 272119000c4b78af75fa20a1840387a00796a287 (diff) | |
| parent | 15cdac1708200c9c575ef76c5b4455b20f0e0543 (diff) | |
| download | tcl-1b524a79cd345ead93435990edd1f04dcf71c9ad.zip tcl-1b524a79cd345ead93435990edd1f04dcf71c9ad.tar.gz tcl-1b524a79cd345ead93435990edd1f04dcf71c9ad.tar.bz2 | |
Don't #define VOID on VxWorks, as it is already typdef'd to void. Eliminate possibly conflicting LOCAL/OFFSET
FossilOrigin-Name: 157acf6411def9acb0f0a72a9b382f248b63151d
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 /* |