diff options
| author | lloyd <[email protected]> | 2009-12-16 22:54:39 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 22:54:39 +0000 |
| commit | 1d595f8976483078c292e365bde3949c9de26332 (patch) | |
| tree | 874f7cb1b2ba23405bc69330e6233eb567bf2ec4 /src/entropy | |
| parent | f3f36611db8c3f6c67c818d454973a0165b0fcf2 (diff) | |
| parent | 85b961ff87c1d6300451538c939c99a2ff74b505 (diff) | |
propagate from branch 'net.randombit.botan' (head 22c82e10d78ad0e2cdaa56cb02f3d846ed0ead5e)
to branch 'net.randombit.botan.c++0x' (head 74dbf310b7fcc11f94a16cd63046219acd5d62bc)
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 73282d8d2..3e7c235ca 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); |