merge with master and fix 4 conflicts by hand

[ardour.git] / libs / pbd / pbd / clear_dir.h

diff --git a/libs/pbd/pbd/clear_dir.h b/libs/pbd/pbd/clear_dir.h
index 5f57483b63d26ffae1321b2197d682e04ee89252..efef67012df5b49ecbd7521e0fde10273c4f99d9 100644 (file)
--- a/libs/pbd/pbd/clear_dir.h
+++ b/libs/pbd/pbd/clear_dir.h
@@ -24,7 +24,11 @@
 #include <vector>
 #include <sys/types.h>
 
+#include "pbd/libpbd_visibility.h"
+
 namespace PBD {
+        LIBPBD_API int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
+        LIBPBD_API void remove_directory (const std::string& dir);
         int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
         void remove_directory (const std::string& dir);
 }