config BUGFIX workaround for atomic_load spec bug

In the original C11, atomic_load did not work
with const variables.
Refs #253

Author: michalvasko

src/config.h.in

@@ -38,14 +38,14 @@
 
 # define ATOMIC_UINT32_T atomic_uint_fast32_t
 # define ATOMIC_PTR atomic_uintptr_t
-# define ATOMIC_STORE(x, val) atomic_store(&(x), (uintptr_t)(val))
-# define ATOMIC_LOAD(x) ((void *)atomic_load(&(x)))
+# define ATOMIC_STORE(x, val) atomic_store(&(x), (val))
+# define ATOMIC_LOAD(x) atomic_load((atomic_uintptr_t *)&(x))
 # define ATOMIC_INC(x) atomic_fetch_add(&(x), 1)
 #else
 # define ATOMIC_UINT32_T uint32_t
 # define ATOMIC_PTR void *
-# define ATOMIC_STORE(x, val) (x) = (void *)(val)
-# define ATOMIC_LOAD(x) ((void *)(x))
+# define ATOMIC_STORE(x, val) (x) = (val)
+# define ATOMIC_LOAD(x) (x)
 # define ATOMIC_INC(x) __sync_add_and_fetch(&(x), 1)
 #endif
 

src/session.c

@@ -615,7 +615,7 @@ nc_session_free(struct nc_session *session, void (*data_free)(void *))
 
     /* stop notifications loop if any */
     if ((session->side == NC_CLIENT) && ATOMIC_LOAD(session->opts.client.ntf_tid)) {
-        ATOMIC_STORE(session->opts.client.ntf_tid, NULL);
+        ATOMIC_STORE(session->opts.client.ntf_tid, (uintptr_t)NULL);
         /* the thread now knows it should quit */
     }
 

src/session_client.c

@@ -2214,7 +2214,7 @@ nc_recv_notif_thread(void *arg)
     free(ntarg);
 
     /* remember our allocated tid, we will be freeing it */
-    ntf_tid = ATOMIC_LOAD(session->opts.client.ntf_tid);
+    ntf_tid = (pthread_t *)ATOMIC_LOAD(session->opts.client.ntf_tid);
 
     while (ATOMIC_LOAD(session->opts.client.ntf_tid)) {
         msgtype = nc_recv_notif(session, NC_CLIENT_NOTIF_THREAD_SLEEP / 1000, &notif);
@@ -2235,7 +2235,7 @@ nc_recv_notif_thread(void *arg)
     }
 
     VRB("Session %u: notification thread exit.", session->id);
-    ATOMIC_STORE(session->opts.client.ntf_tid, NULL);
+    ATOMIC_STORE(session->opts.client.ntf_tid, (uintptr_t)NULL);
     free(ntf_tid);
     return NULL;
 }
@@ -2276,14 +2276,14 @@ nc_recv_notif_dispatch(struct nc_session *session, void (*notif_clb)(struct nc_s
         return -1;
     }
     /* just so that nc_recv_notif_thread() does not immediately exit, the value does not matter */
-    ATOMIC_STORE(session->opts.client.ntf_tid, tid);
+    ATOMIC_STORE(session->opts.client.ntf_tid, (uintptr_t)tid);
 
     ret = pthread_create(tid, NULL, nc_recv_notif_thread, ntarg);
     if (ret) {
         ERR("Session %u: failed to create a new thread (%s).", strerror(errno));
         free(ntarg);
         free(tid);
-        ATOMIC_STORE(session->opts.client.ntf_tid, NULL);
+        ATOMIC_STORE(session->opts.client.ntf_tid, (uintptr_t)NULL);
         return -1;
     }