diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-05-30 17:34:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-05-30 17:34:44 (GMT) |
| commit | 8657912b7317999d2cfc40193a166592bd22b23c (patch) | |
| tree | f77f601f0302972e210fbf6cb054179f5acaa3a8 | |
| parent | d9533f25522c080ec6a7a8ef32dbb9f61e4613fd (diff) | |
| download | tk-8657912b7317999d2cfc40193a166592bd22b23c.zip tk-8657912b7317999d2cfc40193a166592bd22b23c.tar.gz tk-8657912b7317999d2cfc40193a166592bd22b23c.tar.bz2 | |
* generic/tk.h: Correct placement of #include <tcl.h> [Bug 1723812].
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | generic/tk.h | 14 |
2 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,7 @@ 2007-05-30 Don Porter <dgp@users.sourceforge.net> + * generic/tk.h: Correct placement of #include <tcl.h> [Bug 1723812]. + * README: Bump version number to 8.4.16 * generic/tk.h: * unix/configure.in: diff --git a/generic/tk.h b/generic/tk.h index 8be88f4..e7ed9d2 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,12 +12,17 @@ * 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.74.2.18 2007/05/30 14:06:20 dgp Exp $ + * RCS: @(#) $Id: tk.h,v 1.74.2.19 2007/05/30 17:34:45 dgp Exp $ */ #ifndef _TK #define _TK +#include <tcl.h> +#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 4) +# error Tk 8.4 must be compiled with tcl.h from Tcl 8.4 +#endif + /* * For C++ compilers, use extern "C" */ @@ -53,13 +58,6 @@ extern "C" { #define TK_VERSION "8.4" #define TK_PATCH_LEVEL "8.4.16" -#ifndef _TCL -# include <tcl.h> -# if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 4) -# error Tk 8.4 must be compiled with tcl.h from Tcl 8.4 -# 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 |