diff options
| author | lloyd <[email protected]> | 2009-12-24 21:38:25 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-24 21:38:25 +0000 |
| commit | 8e0c38eff91fc6c3df5cc0104704baa75149898e (patch) | |
| tree | e6d79db18899068f8cfa77f2455f00c86d86b6ef /src/entropy | |
| parent | c85c79ac51b5829258dae7e51bb472b740da9574 (diff) | |
| parent | a48ae8f6c1aa605acbed76e9e2f1d6c2dcdd3d1e (diff) | |
propagate from branch 'net.randombit.botan' (head 367d157c1221a162f5b4098492944a509ef6d019)
to branch 'net.randombit.botan.c++0x' (head 1b9e8c4e92663f30b7d57b0fd8f57eb13cfce155)
Diffstat (limited to 'src/entropy')
| -rw-r--r-- | src/entropy/beos_stats/es_beos.cpp | 2 | ||||
| -rw-r--r-- | src/entropy/cryptoapi_rng/es_capi.cpp | 2 | ||||
| -rw-r--r-- | src/entropy/hres_timer/hres_timer.cpp | 2 | ||||
| -rw-r--r-- | src/entropy/win32_stats/es_win32.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/entropy/beos_stats/es_beos.cpp b/src/entropy/beos_stats/es_beos.cpp index 18eca5511..148d38b9b 100644 --- a/src/entropy/beos_stats/es_beos.cpp +++ b/src/entropy/beos_stats/es_beos.cpp @@ -5,7 +5,7 @@ * Distributed under the terms of the Botan license */ -#include <botan/es_beos.h> +#include <botan/internal/es_beos.h> #include <kernel/OS.h> #include <kernel/image.h> diff --git a/src/entropy/cryptoapi_rng/es_capi.cpp b/src/entropy/cryptoapi_rng/es_capi.cpp index a70b52044..367166c62 100644 --- a/src/entropy/cryptoapi_rng/es_capi.cpp +++ b/src/entropy/cryptoapi_rng/es_capi.cpp @@ -5,7 +5,7 @@ * Distributed under the terms of the Botan license */ -#include <botan/es_capi.h> +#include <botan/internal/es_capi.h> #include <botan/parsing.h> #include <windows.h> #include <wincrypt.h> diff --git a/src/entropy/hres_timer/hres_timer.cpp b/src/entropy/hres_timer/hres_timer.cpp index 3e7c235ca..9f0a25c9b 100644 --- a/src/entropy/hres_timer/hres_timer.cpp +++ b/src/entropy/hres_timer/hres_timer.cpp @@ -25,7 +25,7 @@ void High_Resolution_Timestamp::poll(Entropy_Accumulator& accum) accum.add(tv.QuadPart, 0); #endif -#if defined(BOTAN_USE_GCC_INLINE_ASM) +#if BOTAN_USE_GCC_INLINE_ASM u64bit rtc = 0; diff --git a/src/entropy/win32_stats/es_win32.cpp b/src/entropy/win32_stats/es_win32.cpp index a8e9e40f5..e9f564fee 100644 --- a/src/entropy/win32_stats/es_win32.cpp +++ b/src/entropy/win32_stats/es_win32.cpp @@ -5,7 +5,7 @@ * Distributed under the terms of the Botan license */ -#include <botan/es_win32.h> +#include <botan/internal/es_win32.h> #include <windows.h> #include <tlhelp32.h> |