diff options
| author | lloyd <[email protected]> | 2010-10-13 03:25:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-13 03:25:16 +0000 |
| commit | ba142ed2eaa21445d49cbbc8ae3b3d4dc625b9d7 (patch) | |
| tree | be1a9fa07d0ea26fd7713bb52205f7a3bcc3e907 /src/entropy | |
| parent | 406d4f8556d41083bfa551e7a777b0cb02925b6c (diff) | |
| parent | 5913bf42b4c32e43d0db11bf9299130f3b0b62a4 (diff) | |
propagate from branch 'net.randombit.botan' (head 2898d79f992f27a328a3e41d34b46eb1052da0de)
to branch 'net.randombit.botan.c++0x' (head 6cba76268fd69a73195760c021b7f881b8a6552c)
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 b0bbf6fa7..e9307743f 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); |