diff options
| author | lloyd <[email protected]> | 2010-11-29 22:52:17 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-11-29 22:52:17 +0000 |
| commit | 0e41e0e8d441ff907f092c718db650cda06e2e1a (patch) | |
| tree | 8c0df20500bdf601d4378a6000923501a48ad1f3 /src/utils/cpuid.cpp | |
| parent | 5d4621b745ac529c7df6c4d91e4d2b68bd0325e4 (diff) | |
| parent | 65ab36776317f73ddf0f2d3bd6c1c7e35608962f (diff) | |
propagate from branch 'net.randombit.botan' (head fc8daa606ab7954eab48778d7236986747b719e4)
to branch 'net.randombit.botan.c++0x' (head 2bf71b0a2e0e468d7eb3631e4ca284234f554729)
Diffstat (limited to 'src/utils/cpuid.cpp')
| -rw-r--r-- | src/utils/cpuid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp index c34a99942..30f441bd0 100644 --- a/src/utils/cpuid.cpp +++ b/src/utils/cpuid.cpp @@ -26,7 +26,7 @@ #include <ia32intrin.h> #define CALL_CPUID(type, out) do { __cpuid(out, type); } while(0); -#elif BOTAN_GCC_VERSION >= 430 +#elif (BOTAN_GCC_VERSION >= 430) || defined(BOTAN_BUILD_COMPILER_IS_CLANG) // Only available starting in GCC 4.3 #include <cpuid.h> |