diff options
| author | andreas_kupries <akupries@shaw.ca> | 2002-09-14 02:52:31 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2002-09-14 02:52:31 (GMT) |
| commit | ffa7145291c84c25259567a5ed6cfc14885c2649 (patch) | |
| tree | 6f1b7b85c0b161723d2d019d35eba5f09a3fc111 /generic/tk.h | |
| parent | 3511aff356300b3c67bb9cdea914d9d0680818f9 (diff) | |
| download | tk-ffa7145291c84c25259567a5ed6cfc14885c2649.zip tk-ffa7145291c84c25259567a5ed6cfc14885c2649.tar.gz tk-ffa7145291c84c25259567a5ed6cfc14885c2649.tar.bz2 | |
* 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, ...).
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 26 |
1 files changed, 13 insertions, 13 deletions
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> |