Commit 969274a2 authored by Thiago Macieira's avatar Thiago Macieira

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's avatarOrgad Shaneh <orgads@gmail.com>
parent 0173c638
...@@ -46200,7 +46200,7 @@ bool caseless_cmp(char a, char b) ...@@ -46200,7 +46200,7 @@ bool caseless_cmp(char a, char b)
#elif defined(BOTAN_BUILD_COMPILER_IS_INTEL) #elif defined(BOTAN_BUILD_COMPILER_IS_INTEL)
#include <ia32intrin.h> #include <ia32intrin.h>
#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) #elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 430)
...@@ -46223,7 +46223,7 @@ namespace { ...@@ -46223,7 +46223,7 @@ namespace {
} }
#elif defined(BOTAN_TARGET_ARCH_IS_X86_64) && \ #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 * We can't safely use this on x86-32 as some 32-bit ABIs use ebx as
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment