From eadb3f890f6e7ba3b3ca23c6feb144fb35d304ce Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 4 Apr 2016 14:41:13 -0400 Subject: [PATCH] FS-8780: fix the include for Windows builds that point to in tree lib --- libs/libzrtp/include/zrtp_config.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/libzrtp/include/zrtp_config.h b/libs/libzrtp/include/zrtp_config.h index 0e2ee73b71..b4631c2007 100644 --- a/libs/libzrtp/include/zrtp_config.h +++ b/libs/libzrtp/include/zrtp_config.h @@ -21,7 +21,7 @@ # define ZRTP_PLATFORM ZP_ANDROID # elif defined(__FreeBSD__) # define ZRTP_PLATFORM ZP_BSD -# elif defined(linux) || defined(__linux) +# elif defined(linux) || defined(__linux__) || defined(__linux) # include # define ZRTP_PLATFORM ZP_LINUX # elif defined(__MACOSX__) || defined (__APPLE__) || defined (__MACH__) @@ -88,7 +88,13 @@ */ #define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN -#elif defined(ARM) || defined(_ARM_) || defined(ARMV4) || defined(__arm__) +#elif defined(__AARCH64EB__) +/* + * aarch64, big endian + */ +#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN + +#elif defined(ARM) || defined(_ARM_) || defined(ARMV4) || defined(__arm__) || defined(__AARCH64EL__) /* * ARM, default to little endian */