diff --git a/rtengine/helpersse2.h b/rtengine/helpersse2.h index 8eece0ae7..8d35a40d5 100644 --- a/rtengine/helpersse2.h +++ b/rtengine/helpersse2.h @@ -22,7 +22,7 @@ typedef __m128i vint2; // #ifdef __GNUC__ - #if __GNUC__ == 4 && __GNUC_MINOR__ >= 9 + #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4 #define LVF(x) _mm_load_ps(&x) #define LVFU(x) _mm_loadu_ps(&x) #define STVF(x,y) _mm_store_ps(&x,y) diff --git a/rtengine/opthelper.h b/rtengine/opthelper.h index 4c02a3b43..2f7099687 100644 --- a/rtengine/opthelper.h +++ b/rtengine/opthelper.h @@ -55,7 +55,7 @@ #define RESTRICT __restrict__ #define LIKELY(x) __builtin_expect (!!(x), 1) #define UNLIKELY(x) __builtin_expect (!!(x), 0) - #if __GNUC__ == 4 && __GNUC_MINOR__ >= 9 + #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4 #define ALIGNED64 __attribute__ ((aligned (64))) #define ALIGNED16 __attribute__ ((aligned (16))) #else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3 diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index 1bed66dc4..0a9122a2d 100755 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -18,14 +18,14 @@ */ #ifdef WIN32 // Desired auto detect function is Vista+ -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4 #define WINVER 0x0600 // switching to WINVER for gcc 4.8.1 support on Winx64 #else #define _WIN32_WINNT 0x0600 #endif #include #include -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4 #undef WINVER #else #undef _WIN32_WINNT