comparison scripts/hvresources/HvUtils.h @ 504:b6eb94378ca9 prerelease

update_board

 
 // type definitions
 #include <stdint.h>
 #include <stdbool.h>
 #define hv_size_t size_t
+#define hv_uint64_t uint64_t
 #define hv_uint32_t uint32_t
 #define hv_int32_t int32_t
 #define hv_uint16_t uint16_t
 
 // SIMD-specific includes

   #elif HV_SIMD_NEON
     #if HV_ANDROID
       #define hv_malloc(_n) memalign(16, _n)
       #define hv_free(x) free(x)
     #else
-      //#define hv_malloc(_n) aligned_alloc(16, _n)
-      #define hv_malloc(_n) memalign(16, _n)
+      #define hv_malloc(_n) aligned_alloc(16, _n)
       #define hv_free(x) free(x)
     #endif
   #else // HV_SIMD_NONE
     #define hv_malloc(_n) malloc(_n)
     #define hv_free(_n) free(_n)

 #include <Windows.h>
 #define hv_atomic_bool volatile LONG
 #define HV_SPINLOCK_ACQUIRE(_x) \
 while (InterlockedCompareExchange(&_x, true, false)) { }
 #define HV_SPINLOCK_RELEASE(_x) (_x = false)
-#elif defined(__has_include)
-#if __has_include(<stdatomic.h>)
+#elif __cplusplus || __has_include(<stdatomic.h>)
+#if !__cplusplus
 #include <stdatomic.h>
+#endif
 #define hv_atomic_bool volatile atomic_bool
 #define HV_SPINLOCK_ACQUIRE(_x) \
 bool expected = false; \
 while (!atomic_compare_exchange_strong(&_x, &expected, true)) { expected = false; }
 #define HV_SPINLOCK_RELEASE(_x) atomic_store(&_x, false)
 #else
 #define hv_atomic_bool volatile bool
 #define HV_SPINLOCK_ACQUIRE(_x) _x = true;
 #define HV_SPINLOCK_RELEASE(_x) _x = false;
 #endif
-#else
-#define hv_atomic_bool volatile bool
-#define HV_SPINLOCK_ACQUIRE(_x) _x = true;
-#define HV_SPINLOCK_RELEASE(_x) _x = false;
-#endif
-
 
 #endif // _HEAVY_UTILS_H_