diff options
| author | lloyd <[email protected]> | 2010-05-19 14:06:59 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-05-19 14:06:59 +0000 |
| commit | 2295ef9e8d97065ad2920f5039878728e52a144f (patch) | |
| tree | 8776271409e706f5d2695d6ec05f8fbd3680e4ef /src/entropy/hres_timer/hres_timer.cpp | |
| parent | 4cace3ee04ae9a20a57b1fa11447a1917f0f155d (diff) | |
| parent | b724994a7385e4ddd2e4e0684383302271ea2bf9 (diff) | |
propagate from branch 'net.randombit.botan' (head 66b216669d7ac91303378281d760236153955ae4)
to branch 'net.randombit.botan.c++0x' (head b911a76971563afcde85935a44a43248a3f5b4a6)
Diffstat (limited to 'src/entropy/hres_timer/hres_timer.cpp')
| -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); |