From e15e893f75adb80bafa61bbd2d1f69e0dcd18d48 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Mon, 27 May 2002 17:03:44 +0000 Subject: [PATCH] * include/cln/modules.h (CL_CONCATENATE): New macro. --- ChangeLog | 4 ++++ include/cln/modules.h | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6cf2fb..24220bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-05-27 Richard Kreckel + + * include/cln/modules.h (CL_CONCATENATE): New macro. + 2002-05-10 Richard Kreckel * doc/cln.tex (Building the library): Update recommendations for diff --git a/include/cln/modules.h b/include/cln/modules.h index b7ff435..90addd2 100644 --- a/include/cln/modules.h +++ b/include/cln/modules.h @@ -248,6 +248,12 @@ #define CL_REQUIRE(module) #endif +// Concatenation of macroexpanded tokens. +// Equivalent to CL_CONCAT in src/base/cl_macros.h which we do not want +// to expose, however. +#define CL_CONCATENATE_(xxx,yyy) xxx##yyy +#define CL_CONCATENATE(xxx,yyy) CL_CONCATENATE_(xxx,yyy) + // Sometimes a link time dependency is needed, but without requirements // on initialization order. // @@ -267,7 +273,7 @@ abort(); \ } \ } \ - dummy##_instance; + CL_CONCATENATE(dummy,_instance); #endif #endif /* _CL_MODULES_H */ -- 2.49.0