Fix strmerge

diff --git a/common.h b/common.h
index a5b20871b7e64b82cf8b7bfdb7b2bf58678870b3..a32bd6110ac6f5198757c1b5a958ea959558bd05 100644 (file)
--- a/common.h
+++ b/common.h
@@ -31,7 +31,8 @@
 
 #define ARRAYSIZE(array) (sizeof(array) / sizeof(*array))
 
-#define _STRMERGE(a, b) a##b
+#define __STRMERGE(a, b) a##b
+#define _STRMERGE(a, b) __STRMERGE(a, b)
 
 #ifdef __clang__
 static void __attribute__ ((unused)) _clang_cleanup_func(void (^*dfunc) (void))

diff --git a/net.c b/net.c
index 9caac278b2410297ff905a9ce0aaf5db6cb9c632..4510671c13a4b086f89d0306ba1a299f0132500a 100644 (file)
--- a/net.c
+++ b/net.c
@@ -74,7 +74,7 @@ bool netInitNsFromParent(struct nsjconf_t * nsjconf, int pid)
        }
        rtnl_link_put(rmv);
 
-       _block struct nl_cache *link_cache;
+       __block struct nl_cache *link_cache;
        if ((err = rtnl_link_alloc_cache(sk, AF_UNSPEC, &link_cache)) < 0) {
                LOG_E("rtnl_link_alloc_cache(): %s", nl_geterror(err));
                return false;