* include/cln/modules.h (CL_CONCATENATE): New macro.

diff --git a/ChangeLog b/ChangeLog
index c6cf2fbd931a106ca94df1b3ae6b3530c26134dd..24220bb2cf5190cb7a4e8575f872c69286927e62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-27  Richard Kreckel  <kreckel@ginac.de>
+
+       * include/cln/modules.h (CL_CONCATENATE): New macro.
+
 2002-05-10  Richard Kreckel  <kreckel@ginac.de>
 
        * doc/cln.tex (Building the library): Update recommendations for 

diff --git a/include/cln/modules.h b/include/cln/modules.h
index b7ff435cacdae2fc26c731ee1e1de9cbbb563f48..90addd2738fba28837e8a09b7a8bf703bfec422a 100644 (file)
--- 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 */