From 02ceb3f3a43bd0d5c7e4fe00b99c1f4cc67919a3 Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 5 Mar 2020 19:17:34 +0000 Subject: Have to move the JOIN() macro out of deprecation for this TCL_UNUSED. Alternatives welcome. --- generic/tcl.h | 9 +++++---- 1 file 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. -- cgit v0.12