session server BUGFIX compilation issues

Author: michalvasko

compat/compat.h.in

@@ -123,9 +123,10 @@
 # define ATOMIC_ADD_RELAXED(var, x) atomic_fetch_add_explicit(&(var), x, memory_order_relaxed)
 # define ATOMIC_DEC_RELAXED(var) atomic_fetch_sub_explicit(&(var), 1, memory_order_relaxed)
 # define ATOMIC_SUB_RELAXED(var, x) atomic_fetch_sub_explicit(&(var), x, memory_order_relaxed)
-# define ATOMIC_COMPARE_EXCHANGE_RELAXED(var, exp, des, result) \
-        result = atomic_compare_exchange_strong_explicit(&(var), &(exp), des, memory_order_relaxed, memory_order_relaxed)
 
+# define ATOMIC_PTR_COMPARE_EXCHANGE_RELAXED(var, exp, des, result) \
+        result = atomic_compare_exchange_strong_explicit((ATOMIC_PTR_T *)&(var), &(exp), des, memory_order_relaxed, \
+                memory_order_relaxed)
 # define ATOMIC_PTR_STORE_RELAXED(var, x) atomic_store_explicit(&(var), (uintptr_t)(x), memory_order_relaxed)
 # define ATOMIC_PTR_LOAD_RELAXED(var) ((void *)atomic_load_explicit(&(var), memory_order_relaxed))
 #else
@@ -144,13 +145,13 @@
 # define ATOMIC_ADD_RELAXED(var, x) __sync_fetch_and_add(&(var), x)
 # define ATOMIC_DEC_RELAXED(var) __sync_fetch_and_sub(&(var), 1)
 # define ATOMIC_SUB_RELAXED(var, x) __sync_fetch_and_sub(&(var), x)
-# define ATOMIC_COMPARE_EXCHANGE_RELAXED(var, exp, des, result) \
+
+# define ATOMIC_PTR_COMPARE_EXCHANGE_RELAXED(var, exp, des, result) \
         { \
-            ATOMIC_T __old = __sync_val_compare_and_swap(&(var), exp, des); \
-            result = ATOMIC_LOAD_RELAXED(__old) == ATOMIC_LOAD_RELAXED(exp) ? 1 : 0; \
-            ATOMIC_STORE_RELAXED(exp, ATOMIC_LOAD_RELAXED(__old)); \
+            uintptr_t __old = (uintptr_t)__sync_val_compare_and_swap(&(var), exp, des); \
+            result = ATOMIC_PTR_LOAD_RELAXED(__old) == ATOMIC_PTR_LOAD_RELAXED(exp) ? 1 : 0; \
+            ATOMIC_PTR_STORE_RELAXED(exp, ATOMIC_PTR_LOAD_RELAXED(__old)); \
         }
-
 # define ATOMIC_PTR_STORE_RELAXED(var, x) ((var) = (x))
 # define ATOMIC_PTR_LOAD_RELAXED(var) (var)
 #endif

src/session_server.c

@@ -1141,7 +1141,7 @@ static void
 nc_server_init_cb_ctx(const struct ly_ctx *ctx)
 {
     struct lysc_node *rpc;
-    void *exp;
+    uintptr_t exp;
     int result;
 
     if (global_rpc_clb) {
@@ -1155,8 +1155,8 @@ nc_server_init_cb_ctx(const struct ly_ctx *ctx)
         rpc = (struct lysc_node *)lys_find_path(ctx, NULL, "/ietf-netconf-monitoring:get-schema", 0);
     }
     if (rpc) {
-        exp = NULL;
-        ATOMIC_COMPARE_EXCHANGE_RELAXED(rpc->priv, exp, nc_clb_default_get_schema, result);
+        exp = 0;
+        ATOMIC_PTR_COMPARE_EXCHANGE_RELAXED(rpc->priv, exp, (uintptr_t)nc_clb_default_get_schema, result);
 
         /* whatever */
         (void)result;
@@ -1165,8 +1165,8 @@ nc_server_init_cb_ctx(const struct ly_ctx *ctx)
     /* set default <close-session> callback if not specified */
     rpc = (struct lysc_node *)lys_find_path(ctx, NULL, "/ietf-netconf:close-session", 0);
     if (rpc) {
-        exp = NULL;
-        ATOMIC_COMPARE_EXCHANGE_RELAXED(rpc->priv, exp, nc_clb_default_close_session, result);
+        exp = 0;
+        ATOMIC_PTR_COMPARE_EXCHANGE_RELAXED(rpc->priv, exp, (uintptr_t)nc_clb_default_close_session, result);
         (void)result;
     }
 }