[Minios-devel] [UNIKRAFT PATCH 01/10] include: move UK_CONCAT to essentials

[Yuri Volchkov <yuri.volchkov@xxxxxxxxx>]

This macro is useful not just for tracing.

Signed-off-by: Yuri Volchkov <yuri.volchkov@xxxxxxxxx>
---
 include/uk/essentials.h        | 5 +++++
 lib/ukdebug/include/uk/trace.h | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/uk/essentials.h b/include/uk/essentials.h
index 6170c5d2..e8264c5f 100644
--- a/include/uk/essentials.h
+++ b/include/uk/essentials.h
@@ -147,6 +147,11 @@ extern "C" {
 #define STRINGIFY(x) __STRINGIFY(x)
 #endif
 
+#ifndef UK_CONCAT
+#define __UK_CONCAT_X(a, b) a##b
+#define UK_CONCAT(a, b) __UK_CONCAT_X(a, b)
+#endif
+
 #ifndef MIN
 #define MIN(a, b)                                                              
\
        ({                                                                     \
diff --git a/lib/ukdebug/include/uk/trace.h b/lib/ukdebug/include/uk/trace.h
index 911ca6a6..87453826 100644
--- a/lib/ukdebug/include/uk/trace.h
+++ b/lib/ukdebug/include/uk/trace.h
@@ -66,10 +66,6 @@ struct uk_tracepoint_header {
 extern size_t uk_trace_buffer_free;
 extern char *uk_trace_buffer_writep;
 
-/* TODO: consider to move UK_CONCAT into public headers */
-#define __UK_CONCAT_X(a, b) a##b
-#define UK_CONCAT(a, b) __UK_CONCAT_X(a, b)
-
 #define __UK_NARGS_X(a, b, c, d, e, f, g, h, n, ...) n
 #define UK_NARGS(...)  __UK_NARGS_X(, ##__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1, 0)
 
-- 
2.19.2


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel