From 41d3179f2c117cbaedc8c8ae332b4624dff81f49 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Wed, 21 Jun 2017 01:09:16 +0200
Subject: [PATCH] remove some gcc4.8/windows special code as minimum gcc
 version to build rt is 4.9

---
 rtengine/helpersse2.h      | 2 +-
 rtengine/opthelper.h       | 2 +-
 rtengine/simpleprocess.cc  | 6 ------
 rtgui/filebrowserentry.cc  | 4 ----
 rtgui/thumbimageupdater.cc | 3 ---
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/rtengine/helpersse2.h b/rtengine/helpersse2.h
index 23dd016fa..7e2185a7f 100644
--- a/rtengine/helpersse2.h
+++ b/rtengine/helpersse2.h
@@ -30,7 +30,7 @@ typedef __m128i vint2;
 
 //
 #ifdef __GNUC__
-#if ((__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4) && (!defined(WIN32) || defined( __x86_64__ ))
+#if (!defined(WIN32) || defined( __x86_64__ ))
 #define LVF(x) _mm_load_ps((float*)&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 4b34fc58f..5e9b97931 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) || __GNUC__ > 4) && (!defined(WIN32) || defined( __x86_64__ ))
+        #if (!defined(WIN32) || defined( __x86_64__ ))
             #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, also needed for WIN32 builds
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 2e1c60ff8..539bd5998 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -1571,13 +1571,7 @@ void startBatchProcessing (ProcessingJob* job, BatchProcessingListener* bpl, boo
 {
 
     if (bpl)
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
-        // See Issue 2384 "Very bad response time on win7/64 using gcc 4.8 when queue is running"
-        Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
-
-#else
         Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_LOW);
-#endif
 
 }
 
diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc
index 9bce8575a..d76870788 100644
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -205,11 +205,7 @@ void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengi
         cropParams
     };
 
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
-    const gint priority = G_PRIORITY_DEFAULT;
-#else
     const gint priority = G_PRIORITY_LOW;
-#endif
 
     const auto func = [](gpointer data) -> gboolean {
         tiupdate* const params = static_cast<tiupdate*>(data);
diff --git a/rtgui/thumbimageupdater.cc b/rtgui/thumbimageupdater.cc
index 95618d5ab..533967b72 100644
--- a/rtgui/thumbimageupdater.cc
+++ b/rtgui/thumbimageupdater.cc
@@ -68,11 +68,8 @@ public:
         inactive_waiting_(false)
     {
         int threadCount = 1;
-#if !(__GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__))
-        // See Issue 2431 for explanation
 #ifdef _OPENMP
         threadCount = omp_get_num_procs();
-#endif
 #endif
 
         threadPool_ = new Glib::ThreadPool(threadCount, 0);