summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2020-03-05 19:17:34 (GMT)
committerdgp <dgp@users.sourceforge.net>2020-03-05 19:17:34 (GMT)
commit02ceb3f3a43bd0d5c7e4fe00b99c1f4cc67919a3 (patch)
tree76e3ca76f1b98045718a1952a791e6833a760bff
parent39cde7c0690d27d2111100d0712876e759cf0f54 (diff)
downloadtcl-02ceb3f3a43bd0d5c7e4fe00b99c1f4cc67919a3.zip
tcl-02ceb3f3a43bd0d5c7e4fe00b99c1f4cc67919a3.tar.gz
tcl-02ceb3f3a43bd0d5c7e4fe00b99c1f4cc67919a3.tar.bz2
Have to move the JOIN() macro out of deprecation for this TCL_UNUSED.
Alternatives welcome.
-rw-r--r--generic/tcl.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 4e601ca..6aff9e7 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -81,16 +81,17 @@ extern "C" {
# 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
#ifndef TCL_THREADS
# define TCL_THREADS 1
#endif
#endif /* !TCL_NO_DEPRECATED */
+#ifndef JOIN
+# define JOIN(a,b) JOIN1(a,b)
+# define JOIN1(a,b) a##b
+#endif
+
/*
* A special definition used to allow this header file to be included from
* windows resource files so that they can obtain version information.