diff options
| author | lloyd <[email protected]> | 2010-01-21 16:36:12 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-01-21 16:36:12 +0000 |
| commit | 412a13fc607a57bd9986155d247353ba8e5fb203 (patch) | |
| tree | cbdf63aaa7e9f28a748dedda286e79a138573f74 /src/entropy | |
| parent | 41bed2fa0c4d96faf805cd33850166972dcac114 (diff) | |
| parent | 9b82bb5a720f32e3e7878550310b1151cac188b8 (diff) | |
propagate from branch 'net.randombit.botan' (head 12382647ef0a28fcb11c824c77b670cc88a4f721)
to branch 'net.randombit.botan.c++0x' (head b586a3286d2c4d547ad3add5af9df1455bf4b87b)
Diffstat (limited to 'src/entropy')
| -rw-r--r-- | src/entropy/hres_timer/hres_timer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/entropy/hres_timer/hres_timer.cpp b/src/entropy/hres_timer/hres_timer.cpp index e1b4928df..5725cb154 100644 --- a/src/entropy/hres_timer/hres_timer.cpp +++ b/src/entropy/hres_timer/hres_timer.cpp @@ -7,9 +7,8 @@ #include <botan/internal/hres_timer.h> #include <botan/cpuid.h> -#include <botan/time.h> -#if defined(BOTAN_TARGET_OS_IS_WINDOWS) +#if defined(BOTAN_TARGET_OS_HAS_QUERY_PERF_COUNTER) #include <windows.h> #endif @@ -20,8 +19,7 @@ namespace Botan { */ void High_Resolution_Timestamp::poll(Entropy_Accumulator& accum) { - // If Windows, grab the Performance Counter (usually TSC or PIT) -#if defined(BOTAN_TARGET_OS_IS_WINDOWS) +#if defined(BOTAN_TARGET_OS_HAS_QUERY_PERF_COUNTER) LARGE_INTEGER tv; ::QueryPerformanceCounter(&tv); accum.add(tv.QuadPart, 0); |