diff options
| author | lloyd <[email protected]> | 2009-10-13 16:01:57 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-10-13 16:01:57 +0000 |
| commit | 9268a0455a07d31a66364aa5b7594bd75250b466 (patch) | |
| tree | 63b683ca95448ce083981d002d870a569c2c98a1 /src/alloc | |
| parent | 3bc2bb0461b1b40466821daf0061eab769621eab (diff) | |
| parent | 5318b944acc2a5fa6d445784c710f37c793ff90b (diff) | |
propagate from branch 'net.randombit.botan.1_8' (head c5ae189464f6ef16e3ce73ea7c563412460d76a3)
to branch 'net.randombit.botan' (head e2b95b6ad31c7539cf9ac0ebddb1d80bf63b5b21)
Diffstat (limited to 'src/alloc')
| -rw-r--r-- | src/alloc/mem_pool/mem_pool.cpp | 2 | ||||
| -rw-r--r-- | src/alloc/system_alloc/defalloc.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc/mem_pool/mem_pool.cpp b/src/alloc/mem_pool/mem_pool.cpp index 38e0c3285..dabf5e310 100644 --- a/src/alloc/mem_pool/mem_pool.cpp +++ b/src/alloc/mem_pool/mem_pool.cpp @@ -8,7 +8,7 @@ */ #include <botan/mem_pool.h> -#include <botan/util.h> +#include <botan/rounding.h> #include <botan/mem_ops.h> #include <algorithm> #include <exception> diff --git a/src/alloc/system_alloc/defalloc.cpp b/src/alloc/system_alloc/defalloc.cpp index 8791c74e4..b1b338d71 100644 --- a/src/alloc/system_alloc/defalloc.cpp +++ b/src/alloc/system_alloc/defalloc.cpp @@ -7,7 +7,7 @@ #include <botan/defalloc.h> #include <botan/libstate.h> -#include <botan/util.h> +#include <botan/mlock.h> #include <cstdlib> #include <cstring> |