From 4b751f9e87b293a82aea295a5329823ea2f3a788 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Wed, 5 Nov 2014 11:24:39 +1000
Subject: [PATCH] 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.
---
 gtk2_ardour/main.cc |  6 ------
 libs/pbd/pbd.cc     | 10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index d6aed1dd2d..5c7735bbc1 100644
--- 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 1bf977c90a..738a676d4c 100644
--- 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();
 	}