diff options
| author | lloyd <[email protected]> | 2011-02-11 14:37:07 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-02-11 14:37:07 +0000 |
| commit | e32931ab596731310295592592cd267052664832 (patch) | |
| tree | 41da348fb78e750c3c4be9baaf8b5e05647b8827 /src/entropy/hres_timer/hres_timer.cpp | |
| parent | 5f4f1294b1cf1784f4fd14840a9e0824f4fa8742 (diff) | |
| parent | 0e41e0e8d441ff907f092c718db650cda06e2e1a (diff) | |
propagate from branch 'net.randombit.botan' (head 13a0d36dac3709f3cb88e830ed7f8cab9e7433ab)
to branch 'net.randombit.botan.c++0x' (head 2221ad8796466e7e096645de77ba856a9c902d14)
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 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); |