From 9235d1acaefe176add9f850a552862cb5924fd7c Mon Sep 17 00:00:00 2001 From: RPG3D Date: Thu, 2 May 2019 14:57:15 +0800 Subject: [PATCH 1/2] 1.fix error on build msgpack with UE4 --- include/msgpack/sysdep.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msgpack/sysdep.h b/include/msgpack/sysdep.h index 99bbe1a0..238293be 100644 --- a/include/msgpack/sysdep.h +++ b/include/msgpack/sysdep.h @@ -51,8 +51,8 @@ # endif /* WIN32_LEAN_AND_MEAN */ # endif typedef long _msgpack_atomic_counter_t; -# define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr) -# define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr) +# define _msgpack_sync_decr_and_fetch(ptr) _InterlockedDecrement(ptr) +# define _msgpack_sync_incr_and_fetch(ptr) _InterlockedIncrement(ptr) #elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41) # if defined(__cplusplus) From a1b86507dae1144d92a5f754d2127757a9edc47f Mon Sep 17 00:00:00 2001 From: RPG3D Date: Sat, 4 May 2019 17:12:15 +0800 Subject: [PATCH 2/2] keep compatibility --- include/msgpack/sysdep.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/msgpack/sysdep.h b/include/msgpack/sysdep.h index 238293be..fbe34eaf 100644 --- a/include/msgpack/sysdep.h +++ b/include/msgpack/sysdep.h @@ -51,8 +51,13 @@ # endif /* WIN32_LEAN_AND_MEAN */ # endif typedef long _msgpack_atomic_counter_t; -# define _msgpack_sync_decr_and_fetch(ptr) _InterlockedDecrement(ptr) -# define _msgpack_sync_incr_and_fetch(ptr) _InterlockedIncrement(ptr) +#if defined(_AMD64_) || defined(_M_X64) || defined(_M_ARM64) +# define _msgpack_sync_decr_and_fetch(ptr) _InterlockedDecrement(ptr) +# define _msgpack_sync_incr_and_fetch(ptr) _InterlockedIncrement(ptr) +#else +# define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr) +# define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr) +#endif #elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41) # if defined(__cplusplus)