From 55b1de961489f99723288e162f9d3a062d593368 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 13 Jun 2016 18:40:11 +0300
Subject: Fix includes and update deheader ci script.

---
 src/utils/cpu.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/utils/cpu.cpp')

diff --git a/src/utils/cpu.cpp b/src/utils/cpu.cpp
index 5fb0195a6..672cc115f 100644
--- a/src/utils/cpu.cpp
+++ b/src/utils/cpu.cpp
@@ -22,7 +22,10 @@
 
 #include "logger.h"
 
-#if defined(__linux__) || defined(__linux)
+#if (defined(__amd64__) || defined(__i386__)) && defined(__GNUC__) \
+    && (GCC_VERSION >= 40800) && !defined(ANDROID)
+// nothing
+#elif defined(__linux__) || defined(__linux)
 #include "utils/stringutils.h"
 #endif
 
-- 
cgit v1.2.3-70-g09d2