From 6fe3dd722a2ef475889a82ebfad03fb3d4b06622 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 23 Jun 2016 20:13:56 +0300 Subject: [PATCH] fix byte-order detection when building with MSVC Signed-off-by: Ivailo Monev --- mkspecs/win32/win32.cmake | 3 +++ src/core/global/qglobal.h.cmake | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mkspecs/win32/win32.cmake b/mkspecs/win32/win32.cmake index c43230f8d..a2712ed2b 100644 --- a/mkspecs/win32/win32.cmake +++ b/mkspecs/win32/win32.cmake @@ -4,6 +4,9 @@ if(MINGW) else() add_definitions(-DQT_NEEDS_QMAIN) endif() +if(KATIE_COMPILER STREQUAL "msvc") + add_definitions(-D__LITTLE_ENDIAN__) +endif() set(KATIE_TOOLS "${KATIE_TOOLS} idc") set(KATIE_COMPONENTS "${KATIE_COMPONENTS} Main") diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake index 66af2d806..5b8791a28 100644 --- a/src/core/global/qglobal.h.cmake +++ b/src/core/global/qglobal.h.cmake @@ -127,8 +127,7 @@ // detect target endianness #if defined (__BYTE_ORDER__) && \ - (__BYTE_ORDER__ - 0 == __ORDER_BIG_ENDIAN__ - 0 || __BYTE_ORDER__ - 0 == __ORDER_LITTLE_ENDIAN__ - 0) - + (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) # define Q_BYTE_ORDER __BYTE_ORDER__ # define Q_BIG_ENDIAN __ORDER_BIG_ENDIAN__ # define Q_LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__ @@ -136,7 +135,6 @@ # define Q_BIG_ENDIAN 1234 # define Q_LITTLE_ENDIAN 4321 # define Q_BYTE_ORDER Q_LITTLE_ENDIAN - #elif defined (__BIG_ENDIAN__) # define Q_BIG_ENDIAN 1234 # define Q_LITTLE_ENDIAN 4321 -- 2.11.0