aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/base
diff options
context:
space:
mode:
authorMatej Kenda <matejken@gmail.com>2015-11-19 16:55:32 +0100
committerMatej Kenda <matejken@gmail.com>2015-11-19 16:55:32 +0100
commit87025057e57b6dd34a1477d3d0a89d815905b643 (patch)
tree2b088963410112820d196d4c348d5fcfa1cfe906 /src/lib/base
parentfb103b7d1fe333b3d7424a36ea2f9b90df8b49ef (diff)
Merged two sections of Botan namespace as suggested by randombit. Preprocessing sections are now split in two.
Diffstat (limited to 'src/lib/base')
-rw-r--r--src/lib/base/algo_registry.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/base/algo_registry.h b/src/lib/base/algo_registry.h
index 0ed7dd52d..6214250fc 100644
--- a/src/lib/base/algo_registry.h
+++ b/src/lib/base/algo_registry.h
@@ -23,8 +23,12 @@
#define WIN32_LEAN_AND_MEAN 1
#include <Windows.h>
+#endif
+
namespace Botan {
+#if defined(BOTAN_WORKAROUND_GH_321)
+
class WinCS_Mutex
{
public:
@@ -52,13 +56,8 @@ class WinCS_Mutex
CRITICAL_SECTION m_cs;
};
-} // namespace
-
#endif
-namespace Botan {
-
-
template<typename T>
class Algo_Registry
{