diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tk.h | 8 | ||||
| -rw-r--r-- | macosx/tkMacOSXPort.h | 17 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 17 |
4 files changed, 12 insertions, 36 deletions
@@ -1,3 +1,9 @@ +2008-12-17 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tk.h: VOID --> void + * unix/tkUnixPort.h: + * macosx/tkMacOSXPort.h: + 2008-12-17 Donal K. Fellows <dkf@users.sf.net> * doc/selection.n: Assorted small fixes. [Bugs 2441817,2441884] diff --git a/generic/tk.h b/generic/tk.h index 0144e61..70bd2a5 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.125 2008/11/15 00:00:27 patthoyts Exp $ + * RCS: @(#) $Id: tk.h,v 1.126 2008/12/17 22:51:25 nijtmans Exp $ */ #ifndef _TK @@ -1164,9 +1164,9 @@ typedef struct Tk_Outline { Tk_Dash dash; /* Dash pattern. */ Tk_Dash activeDash; /* Dash pattern if state is active. */ Tk_Dash disabledDash; /* Dash pattern if state is disabled. */ - VOID *reserved1; /* Reserved for future expansion. */ - VOID *reserved2; - VOID *reserved3; + void *reserved1; /* Reserved for future expansion. */ + void *reserved2; + void *reserved3; Tk_TSOffset tsoffset; /* Stipple offset for outline. */ XColor *color; /* Outline color. */ XColor *activeColor; /* Outline color if state is active. */ diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h index 3e89e7e..13bf235 100644 --- a/macosx/tkMacOSXPort.h +++ b/macosx/tkMacOSXPort.h @@ -12,27 +12,12 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXPort.h,v 1.14 2008/08/19 15:52:13 georgeps Exp $ + * RCS: @(#) $Id: tkMacOSXPort.h,v 1.15 2008/12/17 22:51:25 nijtmans Exp $ */ #ifndef _TKMACPORT #define _TKMACPORT -/* - * Macro to use instead of "void" for arguments that must have - * type "void *" in ANSI C; maps them to type "char *" in - * non-ANSI systems. This macro may be used in some of the include - * files below, which is why it is defined here. - */ - -#ifndef VOID -# ifdef __STDC__ -# define VOID void -# else -# define VOID char -# endif -#endif - #include <stdio.h> #include <ctype.h> #include <fcntl.h> diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 280c1db..b360450 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixPort.h,v 1.15 2008/08/28 18:13:36 dgp Exp $ + * RCS: @(#) $Id: tkUnixPort.h,v 1.16 2008/12/17 22:51:25 nijtmans Exp $ */ #ifndef _UNIXPORT @@ -19,21 +19,6 @@ #define __UNIX__ 1 -/* - * Macro to use instead of "void" for arguments that must have - * type "void *" in ANSI C; maps them to type "char *" in - * non-ANSI systems. This macro may be used in some of the include - * files below, which is why it is defined here. - */ - -#ifndef VOID -# ifdef __STDC__ -# define VOID void -# else -# define VOID char -# endif -#endif - #include <stdio.h> #include <ctype.h> #include <fcntl.h> |