The unified diff between revisions [b773b0a7..] and [51b865be..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'include/libstate.h'

#
#
# patch "include/libstate.h"
#  from [cc522cb9ab803f77a13c05a42addb46e0272cdcc]
#    to [723c0621d44f4e256cb7f45a809707bea2089af9]
#
============================================================
--- include/libstate.h	cc522cb9ab803f77a13c05a42addb46e0272cdcc
+++ include/libstate.h	723c0621d44f4e256cb7f45a809707bea2089af9
@@ -1,15 +1,13 @@
 /*************************************************
 * Library Internal/Global State Header File      *
-* (C) 1999-2007 Jack Lloyd                       *
+* (C) 1999-2008 Jack Lloyd                       *
 *************************************************/

 #ifndef BOTAN_LIB_STATE_H__
 #define BOTAN_LIB_STATE_H__

 #include <botan/base.h>
-#include <botan/enums.h>
 #include <botan/init.h>
-#include <botan/ui.h>
 #include <string>
 #include <vector>
 #include <map>
@@ -66,18 +64,19 @@ class BOTAN_DLL Library_State
       class Engine* get_engine_n(u32bit) const;

       class Mutex_Factory* mutex_factory;
-      class Mutex* allocator_lock;
-      class Mutex* engine_lock;
-      class Mutex* rng_lock;

       mutable class Config* config_obj;

+      class Mutex* allocator_lock;
       std::map<std::string, Allocator*> alloc_factory;
       mutable Allocator* cached_default_allocator;

+      class Mutex* rng_lock;
       RandomNumberGenerator* rng;
       std::vector<Allocator*> allocators;
       std::vector<EntropySource*> entropy_sources;
+
+      class Mutex* engine_lock;
       std::vector<class Engine*> engines;
    };