ATOMIC/UCX: renamed ATOMIC_PTR_2_INT to OSHMEM_ATOMIC_PTR_2_INT

Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>

oshmem/mca/atomic/atomic.h

@@ -33,7 +33,7 @@
 
 BEGIN_C_DECLS
 
-#define ATOMIC_PTR_2_INT(ptr, size) ((size) == 8 ? *(uint64_t*)(ptr) : *(uint32_t*)(ptr))
+#define OSHMEM_ATOMIC_PTR_2_INT(ptr, size) ((size) == 8 ? *(uint64_t*)(ptr) : *(uint32_t*)(ptr))
 
 /* ******************************************************************** */
 

oshmem/shmem/c/shmem_cswap.c

@@ -39,8 +39,8 @@
         rc = MCA_ATOMIC_CALL(cswap(                                 \
             (void*)target,                                          \
             &out_value,                                             \
-            ATOMIC_PTR_2_INT(&cond, sizeof(cond)),                  \
-            ATOMIC_PTR_2_INT(&value, sizeof(value)),                \
+            OSHMEM_ATOMIC_PTR_2_INT(&cond, sizeof(cond)),           \
+            OSHMEM_ATOMIC_PTR_2_INT(&value, sizeof(value)),         \
             size,                                                   \
             pe));                                                   \
         RUNTIME_CHECK_RC(rc);                                       \

oshmem/shmem/c/shmem_swap.c

@@ -37,7 +37,7 @@
         rc = MCA_ATOMIC_CALL(swap(                                  \
             (void*)target,                                          \
             (void*)&out_value,                                      \
-            ATOMIC_PTR_2_INT(&value, sizeof(value)),                \
+            OSHMEM_ATOMIC_PTR_2_INT(&value, sizeof(value)),         \
             size,                                                   \
             pe));                                                   \
         RUNTIME_CHECK_RC(rc);                                       \