summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-04-09 15:57:51 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-04-09 15:57:51 (GMT)
commit41349c568581d62c77d1a938174bddff5642ba57 (patch)
tree0f0ae7cb400a5f65f93aade81f16693e33b5fbda /generic
parentc5898f8ecc3267ce4b19d9aed506accd28abcce1 (diff)
downloadtk-41349c568581d62c77d1a938174bddff5642ba57.zip
tk-41349c568581d62c77d1a938174bddff5642ba57.tar.gz
tk-41349c568581d62c77d1a938174bddff5642ba57.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]
Diffstat (limited to 'generic')
-rw-r--r--generic/tk.h4
1 files changed, 3 insertions, 1 deletions
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"