aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/log.txt3
-rw-r--r--src/utils/cpuid.cpp4
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/log.txt b/doc/log.txt
index 84379c3e8..c2728e8db 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -2,6 +2,9 @@
* 1.9.2-dev, ????-??-??
- Add SIMD version of XTEA
- Support both SSE2 and AltiVec SIMD for Serpent and XTEA
+ - Optimizations for SHA-1 and SHA-2
+ - Add AltiVec runtime detection
+ - Fix x86 CPU identification with Intel C++ and Visual C++
* 1.9.1, 2009-10-23
- Better support for Python and Perl wrappers
diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index 2d3b5d92c..448054c49 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -17,10 +17,10 @@
#include <intrin.h>
#define CALL_CPUID(type, out) do { __cpuid((int*)out, type); } while(0)
-#elif defined(BOTAN_BUILD_COMPILER_IS_ICC)
+#elif defined(BOTAN_BUILD_COMPILER_IS_INTEL)
#include <ia32intrin.h>
- #define CALL_CPUID(type, out) do { __cpuid(out, type) } while(0);
+ #define CALL_CPUID(type, out) do { __cpuid(out, type); } while(0);
#elif defined(BOTAN_BUILD_COMPILER_IS_GCC)