Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

diff --cc libs/pbd/pathexpand.cc
index ae3bed4599df4ca04d06d3a2a030348b3a82ca4e,89fc148ad7be4a2e60656852f7c4a847d862a1c3..3f1f1cf670d12dfbb3719d42a6ddb7e7d334f9fd
--- 1/libs/pbd/pathexpand.cc
--- 2/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@@ -36,9 -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)) {