Merge branch 'master' into windows

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

diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc
index b2fb84760d9a4703219001cf0d5ac8a8c462161d..65f011c745efa0de2f005366d3de4214985073ee 100644 (file)
--- a/libs/pbd/mountpoint.cc
+++ b/libs/pbd/mountpoint.cc
@@ -17,7 +17,7 @@
 
     $Id$
 */
-
+#ifndef  COMPILER_MSVC
 #include <cstdio>
 #include <cstring>
 #include <string>
@@ -94,7 +94,7 @@ mountpoint (string path)
        return best;
 }
 
-#elif defined(WIN32)
+#elif defined(PLATFORM_WINDOWS)
 
 string
 mountpoint (string path)
@@ -172,3 +172,7 @@ main (int argc, char *argv[])
 }
 
 #endif // TEST_MOUNTPOINT
+
+#else  // COMPILER_MSVC
+       const char* pbd_mountpoint = "pbd/msvc/mountpoint.cc takes precedence over this file";
+#endif // COMPILER_MSVC