From 07cb62a5035ec291c09ab91a05cde33fb1c3f377 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 9 Jan 2018 11:41:26 -0800 Subject: cleanup --- node/Utils.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'node/Utils.hpp') diff --git a/node/Utils.hpp b/node/Utils.hpp index 8dd0292a..1b2b65aa 100644 --- a/node/Utils.hpp +++ b/node/Utils.hpp @@ -40,8 +40,9 @@ #include "Constants.hpp" -// So it's 2017 and this still helps on most Linux versions. It shouldn't but it does. Go figure. -#if defined(__LINUX__) && ((defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64))) +#ifdef __LINUX__ + +#if (defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64)) #include static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) { @@ -74,6 +75,10 @@ static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) #define ZT_FAST_MEMCPY(a,b,c) memcpy(a,b,c) #endif +#else +#define ZT_FAST_MEMCPY(a,b,c) memcpy(a,b,c) +#endif + namespace ZeroTier { /** -- cgit v1.2.3