fix errors in manual conflict resolution

diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index c0e4fba0de4b99ecbc189179ec9634b45a7247c4..37a7e67d2ef4c35a460ba151941c84f15ce41c14 100644 (file)
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -85,9 +85,6 @@ public:
        void existence_check ();
        virtual void prevent_deletion ();
 
-       void existence_check ();
-       virtual void prevent_deletion ();
-
 protected:
        FileSource (Session& session, DataType type,
                    const std::string& path,

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 44d965a4f6dc44f784c9eae62a76da9aaca8a22e..93adfd71f97ab91ad76ca3eb61925f5028331c73 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -81,8 +81,6 @@ public:
 
        void prevent_deletion ();
 
-       void prevent_deletion ();
-
   protected:
        void set_path (const std::string& newpath);
 

diff --git a/libs/pbd/clear_dir.cc b/libs/pbd/clear_dir.cc
index 36c6fcf9f8bacd3ba3b3853a5a59329c41f89a14..c38713897b4740c0aaac18f899269240744f6357 100644 (file)
--- a/libs/pbd/clear_dir.cc
+++ b/libs/pbd/clear_dir.cc
@@ -33,6 +33,7 @@ using PBD::closedir;
 #include <string.h>
 
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"

diff --git a/libs/pbd/pbd/clear_dir.h b/libs/pbd/pbd/clear_dir.h
index efef67012df5b49ecbd7521e0fde10273c4f99d9..f669b84485d5e03094f9405850977a5b614c8134 100644 (file)
--- a/libs/pbd/pbd/clear_dir.h
+++ b/libs/pbd/pbd/clear_dir.h
@@ -29,8 +29,6 @@
 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);
 }
 
 #endif /* __pbd_clear_dir_h__ */