lib/uklibparam: Namespace symbols to avoid conflicts

Namespace the `__uk_libparam_param` and `__uk_libparam_pdata`
symbols exported by each library to avoid conflicts when two
libraries export a parameter with the same name.

Signed-off-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #1526

diff --git a/lib/uklibparam/include/uk/libparam.h b/lib/uklibparam/include/uk/libparam.h
index 4111f8ce07bb93e57ab4859075116a62072b3b28..c0dca15cfa01120b70767c499c41fb9d3c90b239 100644 (file)
--- a/lib/uklibparam/include/uk/libparam.h
+++ b/lib/uklibparam/include/uk/libparam.h
@@ -66,8 +66,16 @@ extern C {
  * A library parameter descriptor (struct uk_libparam_desc) is referencing to
  * the section's base address for iteration.
  */
-#define UK_LIBPARAM_PARAM_NAMEPREFIX          __uk_libparam_param_
-#define UK_LIBPARAM_PDATA_NAMEPREFIX          __uk_libparam_pdata_
+#define _UK_LIBPARAM_PARAM_NAMEPREFIX      __uk_libparam_param_
+#define UK_LIBPARAM_PARAM_NAMEPREFIX                                       \
+       UK_LIBPARAM_CONCAT(UK_LIBPARAM_CONCAT(_UK_LIBPARAM_PARAM_NAMEPREFIX,\
+                                             UK_LIBPARAM_LIBPREFIX), _)
+
+#define _UK_LIBPARAM_PDATA_NAMEPREFIX                                      \
+       __uk_libparam_pdata_
+#define UK_LIBPARAM_PDATA_NAMEPREFIX                                       \
+       UK_LIBPARAM_CONCAT(UK_LIBPARAM_CONCAT(_UK_LIBPARAM_PDATA_NAMEPREFIX,\
+                                             UK_LIBPARAM_LIBPREFIX), _)
 
 #define UK_LIBPARAM_PARAMSECTION_NAME       uk_libparam_params
 #define UK_LIBPARAM_PARAMSECTION_STARTSYM   \