diff options
| author | lloyd <[email protected]> | 2009-12-22 04:50:18 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-22 04:50:18 +0000 |
| commit | c85c79ac51b5829258dae7e51bb472b740da9574 (patch) | |
| tree | d02818ecdf25c028ead796c2a06bc10ac596924f /src/entropy/hres_timer | |
| parent | c2c896ee870285b836f80b30a042941b03ddd440 (diff) | |
| parent | 93e8fd697d009dfef3b994a77936cbf88d2d2ba3 (diff) | |
propagate from branch 'net.randombit.botan' (head 5525439539abc808b7b8588380a362303cf3c599)
to branch 'net.randombit.botan.c++0x' (head 6749468bfbdeff4636b7a15de412a6c89f1aea87)
Diffstat (limited to 'src/entropy/hres_timer')
| -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); |