propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)

            to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)

3 files changed, 8 insertions, 7 deletions

diff --git a/Attic/mutex/pthreads/info.txt b/Attic/mutex/pthreads/info.txt
index 7315c186a..1d826b61c 100644
--- a/Attic/mutex/pthreads/info.txt
+++ b/Attic/mutex/pthreads/info.txt
@@ -1,11 +1,12 @@
 define MUTEX_PTHREAD
 
-load_on auto
-
-<add>
+<source>
 mux_pthr.cpp
+</source>
+
+<header:internal>
 mux_pthr.h
-</add>
+</header:internal>
 
 <libs>
 all!qnx,freebsd,dragonfly,openbsd,netbsd -> pthread
diff --git a/Attic/mutex/pthreads/mux_pthr.cpp b/Attic/mutex/pthreads/mux_pthr.cpp
index 9f1d9816e..75a116fe8 100644
--- a/Attic/mutex/pthreads/mux_pthr.cpp
+++ b/Attic/mutex/pthreads/mux_pthr.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mux_pthr.h>
+#include <botan/internal/mux_pthr.h>
 #include <botan/exceptn.h>
 
 #ifndef _POSIX_C_SOURCE
diff --git a/Attic/mutex/pthreads/mux_pthr.h b/Attic/mutex/pthreads/mux_pthr.h
index 118853947..27b854265 100644
--- a/Attic/mutex/pthreads/mux_pthr.h
+++ b/Attic/mutex/pthreads/mux_pthr.h
@@ -8,14 +8,14 @@
 #ifndef BOTAN_MUTEX_PTHREAD_H__
 #define BOTAN_MUTEX_PTHREAD_H__
 
-#include <botan/mutex.h>
+#include <botan/internal/mutex.h>
 
 namespace Botan {
 
 /*
 * Pthread Mutex Factory
 */
-class BOTAN_DLL Pthread_Mutex_Factory : public Mutex_Factory
+class Pthread_Mutex_Factory : public Mutex_Factory
    {
    public:
       Mutex* make();