summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-08-20 15:39:12 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-08-20 15:39:12 (GMT)
commit76c397a9c55474d5859fcbf98e50f57ab0a55a3c (patch)
tree35a97189737d406adab9b960569695376bf684aa /generic/tk.h
parent163b375ee9442d6033f85c6a21d4b48478ddf1ef (diff)
downloadtk-76c397a9c55474d5859fcbf98e50f57ab0a55a3c.zip
tk-76c397a9c55474d5859fcbf98e50f57ab0a55a3c.tar.gz
tk-76c397a9c55474d5859fcbf98e50f57ab0a55a3c.tar.bz2
* README: Bumped version number to 8.4b3 to distinguishmacosx_8_4_merge_2002_08_20_trunk
* generic/tk.h: HEAD from the 8.4b2 release. * unix/configure.in: * win/configure.in: * unix/tk.spec: * unix/configure: autoconf * win/configure: * generic/tk.h: Added compile-time check that the tcl.h header file #included by Tk 8.4 is one from Tcl 8.4. This is needed to be sure that new #defines like CONST84 are available. [Bug 597432].
Diffstat (limited to 'generic/tk.h')
-rw-r--r--generic/tk.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tk.h b/generic/tk.h
index f6a7e78..1d8a0cd 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.66 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.67 2002/08/20 15:39:13 dgp Exp $
*/
#ifndef _TK
@@ -48,10 +48,10 @@ extern "C" {
#define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 4
#define TK_RELEASE_LEVEL TCL_BETA_RELEASE
-#define TK_RELEASE_SERIAL 2
+#define TK_RELEASE_SERIAL 3
#define TK_VERSION "8.4"
-#define TK_PATCH_LEVEL "8.4b2"
+#define TK_PATCH_LEVEL "8.4b3"
/*
* The following definitions set up the proper options for Macintosh
@@ -66,6 +66,9 @@ extern "C" {
#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
/*