Merge branch 'master' into windows

[ardour.git] / libs / pbd / pathscanner.cc

diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc
index 8f57726c7f65206b42ea3bbd65507a59a0496c04..b9b501a1201766abb8e0f22a7ab23e9556bb6f74 100644 (file)
--- a/libs/pbd/pathscanner.cc
+++ b/libs/pbd/pathscanner.cc
@@ -18,17 +18,26 @@
     $Id$
 */
 
+#ifdef COMPILER_MSVC
+#include <stdlib.h>
+#include <stdio.h>
+using PBD::readdir;
+using PBD::opendir;
+using PBD::closedir;
+#else
+#include <dirent.h>
 #include <cstdlib>
 #include <cstdio>
+#endif
 #include <cstring>
 #include <vector>
-#include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
+#include "pbd/pathexpand.h"
 #include "pbd/pathscanner.h"
 #include "pbd/stl_delete.h"
 
@@ -90,7 +99,7 @@ PathScanner::run_scan_internal (vector<string *> *result,
 {
        DIR *dir;
        struct dirent *finfo;
-       char *pathcopy = strdup (dirpath.c_str());
+       char *pathcopy = strdup (search_path_expand (dirpath).c_str());
        char *thisdir;
        string fullpath;
        string search_str;