From 6b60c1843dbba9d4929496f9292cc78dab945c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Pluci=C5=84ski?= <mplucinski@mplucinski.com> Date: Wed, 17 Feb 2016 23:04:39 +0100 Subject: [PATCH] SystemInformation: Fix compilation on VS Clang/C2 toolset Change-Id: If1ef48369feca8bfd0a3831146fae6688f934b0c --- SystemInformation.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 1d8723c..512d5fb 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -200,13 +200,13 @@ typedef struct rlimit ResourceLimitType; # endif #endif -#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_WIN64) +#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_WIN64) && !defined(__clang__) #define USE_ASM_INSTRUCTIONS 1 #else #define USE_ASM_INSTRUCTIONS 0 #endif -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__clang__) #include <intrin.h> #define USE_CPUID_INTRINSICS 1 #else -- GitLab