diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-05-19 20:37:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-05-19 20:37:08 (GMT) |
| commit | 5cc246634139a54eca779946d332328fa04266c1 (patch) | |
| tree | 407017ea92745919245da494113d7c1733b41196 /generic/tcl.h | |
| parent | f020f66488c092df61ceaeb8df38b74538b8ac1b (diff) | |
| parent | 1b524a79cd345ead93435990edd1f04dcf71c9ad (diff) | |
| download | tcl-5cc246634139a54eca779946d332328fa04266c1.zip tcl-5cc246634139a54eca779946d332328fa04266c1.tar.gz tcl-5cc246634139a54eca779946d332328fa04266c1.tar.bz2 | |
Don't #define VOID on VxWorks, as it is already typdef'd to void. Eliminate possibly conflicting LOCAL/OFFSET
FossilOrigin-Name: 837d5a924d2af70176bfe48ebdd9b34f776fa28e
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 /* |