diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-04-09 15:57:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-04-09 15:57:51 (GMT) |
| commit | 6bcad233a4fa3b56e8190213bfd0a095ecab2e23 (patch) | |
| tree | 0f0ae7cb400a5f65f93aade81f16693e33b5fbda | |
| parent | 038aae6c4ff3e68c3afd0bf80311e331febedad3 (diff) | |
| download | tk-6bcad233a4fa3b56e8190213bfd0a095ecab2e23.zip tk-6bcad233a4fa3b56e8190213bfd0a095ecab2e23.tar.gz tk-6bcad233a4fa3b56e8190213bfd0a095ecab2e23.tar.bz2 | |
* generic/tk.h: Restore _TCL guards around tcl.h inclusion to restore
compat with early 8.4.* releases. Thanks Stuart Cassoff. [Bug 1723812]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tk.h | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2009-04-09 Don Porter <dgp@users.sourceforge.net> + + * generic/tk.h: Restore _TCL guards around tcl.h inclusion to restore + compat with early 8.4.* releases. Thanks Stuart Cassoff. [Bug 1723812] + 2009-02-28 Pat Thoyts <patthoyts@users.sourceforge.net> * generic/tkWindow.c: [Bug 2645457] check for dead windows after diff --git a/generic/tk.h b/generic/tk.h index 1e90659..d03ce55 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,16 +12,18 @@ * 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.23 2008/08/06 16:54:48 jenglish Exp $ + * RCS: @(#) $Id: tk.h,v 1.74.2.24 2009/04/09 15:57:52 dgp Exp $ */ #ifndef _TK #define _TK +#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 /* * For C++ compilers, use extern "C" |