propagate from branch 'net.randombit.botan' (head aabb4c3bc2207ceac1920573293b95d138a185df)

            to branch 'net.randombit.botan.c++0x' (head 179172dd6952f15f832855f4ec0ac48cb1e08188)

1 files changed, 2 insertions, 1 deletions

diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index c2e0ae80d..8e18703e6 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -10,6 +10,7 @@
 #include <botan/internal/defalloc.h>
 #include <botan/internal/default_engine.h>
 #include <botan/internal/stl_util.h>
+#include <botan/internal/mlock.h>
 #include <algorithm>
 
 #if defined(BOTAN_HAS_SELFTESTS)
@@ -211,7 +212,7 @@ void Library_State::initialize()
       throw Invalid_State("Library_State has already been initialized");
 
    cached_default_allocator = 0;
-   default_allocator_name = "locking";
+   default_allocator_name = has_mlock() ? "locking" : "malloc";
 
    add_allocator(new Malloc_Allocator);
    add_allocator(new Locking_Allocator);