propagate from branch 'net.randombit.botan' (head 8cb312218bfd603dea11a2858a7a52c98b6e8d51)

            to branch 'net.randombit.botan.ssl' (head 2d8711e311473c352c68c9633a4069d359a66fcc)

8 files changed, 11 insertions, 11 deletions

diff --git a/src/filters/filter.cpp b/src/filters/filter.cpp
index ca32a3801..ff223ae8c 100644
--- a/src/filters/filter.cpp
+++ b/src/filters/filter.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/filter.h>
-#include <botan/internal/secqueue.h>
+#include <botan/secqueue.h>
 #include <botan/exceptn.h>
 
 namespace Botan {
diff --git a/src/filters/info.txt b/src/filters/info.txt
index 94b91371b..95d411c76 100644
--- a/src/filters/info.txt
+++ b/src/filters/info.txt
@@ -24,11 +24,11 @@ filters.h
 key_filt.h
 pbe.h
 pipe.h
+secqueue.h
 </header:public>
 
 <header:internal>
 out_buf.h
-secqueue.h
 </header:internal>
 
 <requires>
diff --git a/src/filters/out_buf.cpp b/src/filters/out_buf.cpp
index 80189eb3c..e3ea0cfb5 100644
--- a/src/filters/out_buf.cpp
+++ b/src/filters/out_buf.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/internal/out_buf.h>
-#include <botan/internal/secqueue.h>
+#include <botan/secqueue.h>
 
 namespace Botan {
 
diff --git a/src/filters/pipe.cpp b/src/filters/pipe.cpp
index ad975a275..77e4ae283 100644
--- a/src/filters/pipe.cpp
+++ b/src/filters/pipe.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/pipe.h>
 #include <botan/internal/out_buf.h>
-#include <botan/internal/secqueue.h>
+#include <botan/secqueue.h>
 #include <botan/parsing.h>
 
 namespace Botan {
diff --git a/src/filters/pipe_rw.cpp b/src/filters/pipe_rw.cpp
index de77c6b43..20119c75b 100644
--- a/src/filters/pipe_rw.cpp
+++ b/src/filters/pipe_rw.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/pipe.h>
 #include <botan/internal/out_buf.h>
-#include <botan/internal/secqueue.h>
+#include <botan/secqueue.h>
 
 namespace Botan {
 
diff --git a/src/filters/secqueue.cpp b/src/filters/secqueue.cpp
index 74897805c..f63ef898c 100644
--- a/src/filters/secqueue.cpp
+++ b/src/filters/secqueue.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/secqueue.h>
+#include <botan/secqueue.h>
 #include <algorithm>
 
 namespace Botan {
diff --git a/src/filters/secqueue.h b/src/filters/secqueue.h
index 75f650030..fc1fc213a 100644
--- a/src/filters/secqueue.h
+++ b/src/filters/secqueue.h
@@ -16,7 +16,7 @@ namespace Botan {
 /*
 * SecureQueue
 */
-class SecureQueue : public Fanout_Filter, public DataSource
+class BOTAN_DLL SecureQueue : public Fanout_Filter, public DataSource
    {
    public:
       void write(const byte[], u32bit);
diff --git a/src/utils/mlock.cpp b/src/utils/mlock.cpp
index bb3a38d4e..5d6fc3591 100644
--- a/src/utils/mlock.cpp
+++ b/src/utils/mlock.cpp
@@ -22,9 +22,9 @@ namespace Botan {
 bool lock_mem(void* ptr, u32bit bytes)
    {
 #if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
-   return (mlock(ptr, bytes) == 0);
+   return (::mlock(ptr, bytes) == 0);
 #elif defined(BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK)
-   return (VirtualLock(ptr, bytes) != 0);
+   return (::VirtualLock(ptr, bytes) != 0);
 #else
    return false;
 #endif
@@ -36,9 +36,9 @@ bool lock_mem(void* ptr, u32bit bytes)
 void unlock_mem(void* ptr, u32bit bytes)
    {
 #if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
-   munlock(ptr, bytes);
+   ::munlock(ptr, bytes);
 #elif defined(BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK)
-   VirtualUnlock(ptr, bytes);
+   ::VirtualUnlock(ptr, bytes);
 #endif
    }