Move setting _fmode flag on windows into PBD::init

This moves setting of _fmode slightly later in the initialization
of the application via Ardour::init.

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index d6aed1dd2dcd4c5e8f711394a2db1f366c4cad45..5c7735bbc1af5db1589a57aedd71b2178cb59d07 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -169,12 +169,6 @@ int ardour_main (int argc, char *argv[])
 int main (int argc, char *argv[])
 #endif
 {
-#ifdef PLATFORM_WINDOWS
-       // Essential!!  Make sure that any files used by Ardour
-       //              will be created or opened in BINARY mode!
-       _fmode = O_BINARY;
-#endif
-
        fixup_bundle_environment (argc, argv, &localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */

diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc
index 1bf977c90a0d51a935ce6d50de4e8ffbf56f33e3..738a676d4c90e3b43e48529fc71ce5bff66e57ce 100644 (file)
--- a/libs/pbd/pbd.cc
+++ b/libs/pbd/pbd.cc
@@ -20,6 +20,10 @@
 #include <iostream>
 #include <cstdlib>
 
+#ifdef PLATFORM_WINDOWS
+#include <fcntl.h>
+#endif
+
 #include <giomm.h>
 
 #include <glibmm/thread.h>
@@ -46,6 +50,12 @@ PBD::init ()
                return true;
        }
 
+#ifdef PLATFORM_WINDOWS
+       // Essential!!  Make sure that any files used by Ardour
+       //              will be created or opened in BINARY mode!
+       _fmode = O_BINARY;
+#endif
+
        if (!Glib::thread_supported()) {
                Glib::thread_init();
        }