If we are going to lazily initialize, just create the type and call

its constructor directly, instead of going through LibraryInitializer.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index 1a980b95f..c7d2bb161 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -8,7 +8,6 @@
 #include <botan/libstate.h>
 #include <botan/charset.h>
 #include <botan/engine.h>
-#include <botan/init.h>
 #include <botan/internal/defalloc.h>
 #include <botan/internal/default_engine.h>
 #include <botan/internal/mutex.h>
@@ -77,7 +76,10 @@ Library_State& global_state()
       on or memory might leak.
    */
    if(!global_lib_state)
-      LibraryInitializer::initialize("thread_safe=true");
+      {
+      global_lib_state = new Library_State;
+      global_lib_state->initialize(true);
+      }
 
    return (*global_lib_state);
    }