summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-31 12:41:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-31 12:41:37 (GMT)
commitc122ab6dc1e84c1b07be22f6b1b3983df7268a68 (patch)
treecb292af67bf9c892e222f9bab28866705e5d321d
parent2bea6b651923747d30f9f4a14507f55ebe1765ea (diff)
parentf87865465eb042e0a72a84cffe3f1a9f60da99e6 (diff)
downloadtk-c122ab6dc1e84c1b07be22f6b1b3983df7268a68.zip
tk-c122ab6dc1e84c1b07be22f6b1b3983df7268a68.tar.gz
tk-c122ab6dc1e84c1b07be22f6b1b3983df7268a68.tar.bz2
Merge trunk.
Define some macros in tk.h which are needed by Tk as fallback, which might be removed from future tcl.h versions.
-rw-r--r--generic/tk.h27
1 files changed, 26 insertions, 1 deletions
diff --git a/generic/tk.h b/generic/tk.h
index 1594dc9..aa9cd22 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -20,7 +20,32 @@
#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
# error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
#endif
-
+
+#ifndef CONST84
+# define CONST84 const
+# define CONST84_RETURN const
+#endif
+#ifndef CONST86
+# define CONST86 CONST84
+#endif
+#ifndef EXTERN
+# define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
+/*
+ * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
+ * quotation marks), JOIN joins two arguments.
+ */
+
+#ifndef STRINGIFY
+# define STRINGIFY(x) STRINGIFY1(x)
+# define STRINGIFY1(x) #x
+#endif
+#ifndef JOIN
+# define JOIN(a,b) JOIN1(a,b)
+# define JOIN1(a,b) a##b
+#endif
+
/*
* For C++ compilers, use extern "C"
*/