merge with master, with minor conflict fixes

[ardour.git] / libs / ardour / rc_configuration.cc

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index f4612699d49a2c426c28c5b1fdae3485be444725..7fe030fb7e0102e3d39acc2a44586f45f253900f 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -72,7 +72,7 @@ int
 RCConfiguration::load_state ()
 {
        std::string rcfile;
-       struct stat statbuf;
+       GStatBuf statbuf;
 
        /* load system configuration first */