Merge branch 'master' into windows

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

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index ad53bea37b233cb04cd71ed4031af83c27e3f84d..5784ec942855de3ece0de4e9809333efbb5278e1 100644 (file)
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -36,9 +36,9 @@ using std::vector;
 string
 PBD::canonical_path (const std::string& path)
 {
-#ifdef WIN32
+#ifdef COMPILER_MINGW
        return path;
-#endif
+#else
        char buf[PATH_MAX+1];
 
        if (!realpath (path.c_str(), buf) && (errno != ENOENT)) {
@@ -46,6 +46,7 @@ PBD::canonical_path (const std::string& path)
        }
 
        return string (buf);
+#endif
 }
 
 string