diff options
| author | lloyd <[email protected]> | 2009-12-16 05:15:42 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 05:15:42 +0000 |
| commit | 85b961ff87c1d6300451538c939c99a2ff74b505 (patch) | |
| tree | b5d9ce5c5ce5d1bbce62bac513edbb8c84ad4521 /src/rng | |
| parent | 317b76d71dca1840c9e72f9a26407590719c1423 (diff) | |
Post-merge fixes
Diffstat (limited to 'src/rng')
| -rw-r--r-- | src/rng/hmac_rng/hmac_rng.cpp | 10 | ||||
| -rw-r--r-- | src/rng/randpool/randpool.cpp | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp index 00a3a27d0..84cd647b7 100644 --- a/src/rng/hmac_rng/hmac_rng.cpp +++ b/src/rng/hmac_rng/hmac_rng.cpp @@ -6,18 +6,8 @@ */ #include <botan/hmac_rng.h> -<<<<<<< variant A #include <botan/internal/loadstor.h> #include <botan/internal/xor_buf.h> -#include <botan/internal/stl_util.h> ->>>>>>> variant B -#include <botan/loadstor.h> -#include <botan/xor_buf.h> -####### Ancestor -#include <botan/loadstor.h> -#include <botan/xor_buf.h> -#include <botan/stl_util.h> -======= end #include <algorithm> namespace Botan { diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp index 18a3b49a0..015cac491 100644 --- a/src/rng/randpool/randpool.cpp +++ b/src/rng/randpool/randpool.cpp @@ -6,8 +6,8 @@ */ #include <botan/randpool.h> -#include <botan/loadstor.h> -#include <botan/xor_buf.h> +#include <botan/internal/loadstor.h> +#include <botan/internal/xor_buf.h> #include <algorithm> #include <chrono> |