diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | generic/tk.h | 26 |
2 files changed, 22 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2002-09-13 Andreas Kupries <andreas_kupries@users.sourceforge.net> + + * generic/tk.h: Moved RC_INVOKED down so that tcl.h is still + included when running the resource compiler. <tcl.h> excludes + the unnecessary parts on its own. This reenables the Windows + build. It failed because the non-inclusion of tcl.h caused the + resource compiler to miss some vital macro definitions + (TCL_FINAL_RELEASE, STRINGIFY, ...). + 2002-09-12 Daniel Steffen <das@users.sourceforge.net> * generic/tk.h: diff --git a/generic/tk.h b/generic/tk.h index 9557eae..f533cf1 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.70 2002/09/12 17:34:15 das Exp $ + * RCS: @(#) $Id: tk.h,v 1.71 2002/09/14 02:52:36 andreas_kupries Exp $ */ #ifndef _TK @@ -53,18 +53,6 @@ extern "C" { #define TK_VERSION "8.4" #define TK_PATCH_LEVEL "8.4.0" -/* - * A special definition used to allow this header file to be included - * from windows or mac resource files so that they can obtain version - * information. RC_INVOKED is defined by default by the windows RC tool - * and manually set for macintosh. - * - * Resource compilers don't like all the C stuff, like typedefs and - * procedure declarations, that occur below, so block them out. - */ - -#ifndef RC_INVOKED - /* * The following definitions set up the proper options for Macintosh * compilers. We use this method because there is no autoconf equivalent. @@ -83,6 +71,18 @@ extern "C" { # endif #endif +/* + * A special definition used to allow this header file to be included + * from windows or mac resource files so that they can obtain version + * information. RC_INVOKED is defined by default by the windows RC tool + * and manually set for macintosh. + * + * Resource compilers don't like all the C stuff, like typedefs and + * procedure declarations, that occur below, so block them out. + */ + +#ifndef RC_INVOKED + #ifndef _XLIB_H # if defined (MAC_TCL) # include <Xlib.h> |