From 969274a209b844cecc2fae3ca0392ef8ac70cb5e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 14 Aug 2015 16:06:42 -0700 Subject: [PATCH] Fix Botan compilation with ICC The __cpuid intrinsic takes int* pointers like MSVC above, not uint*. botan.cpp(46265): error: argument of type "Botan::u32bit={unsigned int} *" is incompatible with parameter of type "int *" (whoever thought that a file should have 46k lines needs to have their brains examined) Change-Id: I5128849c354e351ba771215b3290f3af8ba98987 Reviewed-by: Orgad Shaneh --- src/libs/3rdparty/botan/botan.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp index b7a9ddff42..e6a5f228d9 100644 --- a/src/libs/3rdparty/botan/botan.cpp +++ b/src/libs/3rdparty/botan/botan.cpp @@ -46200,7 +46200,7 @@ bool caseless_cmp(char a, char b) #elif defined(BOTAN_BUILD_COMPILER_IS_INTEL) #include - #define CALL_CPUID(type, out) do { __cpuid(out, type); } while(0) + #define CALL_CPUID(type, out) do { __cpuid((int*)out, type); } while(0) #elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 430) @@ -46223,7 +46223,7 @@ namespace { } #elif defined(BOTAN_TARGET_ARCH_IS_X86_64) && \ - (defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC) || defined(BOTAN_BUILD_COMPILER_IS_INTEL)) + (defined(BOTAN_BUILD_COMPILER_IS_CLANG) || defined(BOTAN_BUILD_COMPILER_IS_GCC)) /* * We can't safely use this on x86-32 as some 32-bit ABIs use ebx as -- GitLab