diff options
| author | lloyd <[email protected]> | 2010-08-13 15:13:21 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-08-13 15:13:21 +0000 |
| commit | 3da3b04e1ba1577b3d0e1b4b9b3f4b24381fc433 (patch) | |
| tree | 8a4b3a3b8e830ffcbd41f41859db4ab4fd972fb2 /src/entropy/hres_timer/hres_timer.cpp | |
| parent | 2cae6ec17984ad016f973d5925860278e575b3f4 (diff) | |
| parent | 789cee0888bbede838a2a3cf6221677c9f172872 (diff) | |
propagate from branch 'net.randombit.botan' (head 0a3348f52bf558bc2282e1066c2913a72a1aeda5)
to branch 'net.randombit.botan.c++0x' (head 552c20ae8874f12da779fc25ea368e36e71cbfe8)
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); |