diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-05-30 18:31:46 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-05-30 18:31:46 (GMT) |
| commit | 702b407781f8ca32a92cf1eb1ef46a76d86c15fd (patch) | |
| tree | 3effb4815bb156a448a136a552191d7c806db264 | |
| parent | 416dc3335d4a9e4b5d68f765bc7e9f2de14581d6 (diff) | |
| download | tk-702b407781f8ca32a92cf1eb1ef46a76d86c15fd.zip tk-702b407781f8ca32a92cf1eb1ef46a76d86c15fd.tar.gz tk-702b407781f8ca32a92cf1eb1ef46a76d86c15fd.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tk.h | 14 |
2 files changed, 10 insertions, 8 deletions
@@ -1,3 +1,7 @@ +2007-05-30 Don Porter <dgp@users.sourceforge.net> + + * generic/tk.h: Correct placement of #include <tcl.h> [Bug 1723812]. + 2007-05-30 Daniel Steffen <das@users.sourceforge.net> * library/bgerror.tcl: standardize dialog option & button size diff --git a/generic/tk.h b/generic/tk.h index 6a9944d..7a9355e 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.98.2.1 2007/05/22 20:34:52 dgp Exp $ + * RCS: @(#) $Id: tk.h,v 1.98.2.2 2007/05/30 18:31:47 dgp Exp $ */ #ifndef _TK #define _TK +#include <tcl.h> +#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) +# error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 +#endif + /* * For C++ compilers, use extern "C" */ @@ -53,13 +58,6 @@ extern "C" { #define TK_VERSION "8.5" #define TK_PATCH_LEVEL "8.5b1" -#ifndef _TCL -# include <tcl.h> -# if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) -# error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 -# 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. |