liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possibly fixes some compile errors when using gcc 5.x on windows, no Issue

Browse Source
This commit is contained in:
Ingo
2015-08-05 18:31:10 +02:00
parent aeb11c78e0
commit 37352b02ef
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/helpersse2.h
View File

@@ -22,7 +22,7 @@ typedef __m128i vint2;
// //
#ifdef __GNUC__ #ifdef __GNUC__
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9 #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4
#define LVF(x) _mm_load_ps(&x) #define LVF(x) _mm_load_ps(&x)
#define LVFU(x) _mm_loadu_ps(&x) #define LVFU(x) _mm_loadu_ps(&x)
#define STVF(x,y) _mm_store_ps(&x,y) #define STVF(x,y) _mm_store_ps(&x,y)

2
rtengine/opthelper.h
View File

@@ -55,7 +55,7 @@
#define RESTRICT __restrict__ #define RESTRICT __restrict__
#define LIKELY(x) __builtin_expect (!!(x), 1) #define LIKELY(x) __builtin_expect (!!(x), 1)
#define UNLIKELY(x) __builtin_expect (!!(x), 0) #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 ALIGNED64 __attribute__ ((aligned (64)))
#define ALIGNED16 __attribute__ ((aligned (16))) #define ALIGNED16 __attribute__ ((aligned (16)))
#else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3 #else // there is a bug in gcc 4.7.x when using openmp and aligned memory and -O3

4
rtgui/multilangmgr.cc
View File

@@ -18,14 +18,14 @@
*/ */
#ifdef WIN32 #ifdef WIN32
// Desired auto detect function is Vista+ // 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 #define WINVER 0x0600 // switching to WINVER for gcc 4.8.1 support on Winx64
#else #else
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0600
#endif #endif
#include <windows.h> #include <windows.h>
#include <winnls.h> #include <winnls.h>
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4
#undef WINVER #undef WINVER
#else #else
#undef _WIN32_WINNT #undef _WIN32_WINNT