From: Robin Gareus <robin@gareus.org>
Date: Thu, 17 Sep 2015 12:37:57 +0000 (+0200)
Subject: use pbd's gstdio compatibility wrapper
X-Git-Tag: 4.3~313
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=7ac691ec821c1986282ba9e25b3890dcf07e3e51;p=ardour.git

use pbd's gstdio compatibility wrapper
---

diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 063055b5e6..0a15e92285 100644
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -35,7 +35,7 @@
 #include <glibmm/threads.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index ab74238818..e9411701cc 100644
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -23,7 +23,7 @@
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
-#include <glib/gstdio.h> // for g_remove()
+#include <pbd/gstdio_compat.h>
 
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index a98a43e695..722d6acc17 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -42,7 +42,7 @@
 
 #include <sndfile.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/threads.h>
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index d4be1df22e..e9ca419e3c 100644
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -43,7 +43,7 @@
 #endif
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 04951980d3..0def821ef6 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -20,7 +20,7 @@
 
 #include "ardour/export_handler.h"
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm.h>
 #include <glibmm/convert.h>
 
diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index fef9c74cc7..a4d6239ae4 100644
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -23,7 +23,7 @@
 #include <cerrno>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 5ab66da015..a76fae4fee 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -38,7 +38,7 @@
 #include <time.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #ifdef PLATFORM_WINDOWS
 #include <windows.h> // for LARGE_INTEGER
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 90a15c9e78..2524a3c0b0 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -34,7 +34,7 @@
 #include <sndfile.h>
 #include <samplerate.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm.h>
 
 #include <boost/scoped_array.hpp>
diff --git a/libs/ardour/linux_vst_support.cc b/libs/ardour/linux_vst_support.cc
index bd1ed0d27e..f873917ca9 100644
--- a/libs/ardour/linux_vst_support.cc
+++ b/libs/ardour/linux_vst_support.cc
@@ -29,7 +29,7 @@
 #include <pthread.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 56f1adcc90..877a6577cc 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -25,7 +25,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glib/gprintf.h>
 #include <glibmm.h>
 
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 7a14154d3c..70fe198c72 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -46,7 +46,7 @@
 #include <cstring>
 #endif //LXVST_SUPPORT
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/pattern.h>
 #include <glibmm/fileutils.h>
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 452d8eb1a8..f0041e9856 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -21,7 +21,7 @@
 #include <cstdio> /* for snprintf, grrr */
 
 #include <glib.h>
-#include <glib/gstdio.h> /* for g_stat() */
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 
 #include "pbd/xml++.h"
diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index c831b6536b..22244c80ba 100644
--- a/libs/ardour/recent_sessions.cc
+++ b/libs/ardour/recent_sessions.cc
@@ -24,7 +24,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 2daeee3348..449e39d6a8 100644
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -18,7 +18,7 @@
 */
 
 #include <glib.h>
-#include <glib/gstdio.h> /* for g_stat() */
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h> /* for build_filename() */
 
 #include "pbd/error.h"
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 0c66b91578..346fa0831d 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -50,7 +50,7 @@
 #endif
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <glibmm.h>
 #include <glibmm/threads.h>
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index cc547ed9f5..6b27d2e75c 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -30,7 +30,7 @@
 #include "pbd/stl_delete.h"
 #include "pbd/strsplit.h"
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 
diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index 7f108453b6..0bed6edc2d 100644
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 
 #include "pbd/error.h"
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 54854b61ff..44597645e7 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
diff --git a/libs/ardour/soundcloud_upload.cc b/libs/ardour/soundcloud_upload.cc
index da887d49f5..d725614ea7 100644
--- a/libs/ardour/soundcloud_upload.cc
+++ b/libs/ardour/soundcloud_upload.cc
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <iostream>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "i18n.h"
 
diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc
index b2731247b3..fb8e7dc37a 100644
--- a/libs/ardour/vst_info_file.cc
+++ b/libs/ardour/vst_info_file.cc
@@ -38,7 +38,7 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm.h>
 
 #include "pbd/error.h"
diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index ad5ecb40c6..526a2cb8fb 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -18,7 +18,7 @@
 */
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
diff --git a/libs/audiographer/audiographer/sndfile/tmp_file.h b/libs/audiographer/audiographer/sndfile/tmp_file.h
index 24caf5a723..d19241a21e 100644
--- a/libs/audiographer/audiographer/sndfile/tmp_file.h
+++ b/libs/audiographer/audiographer/sndfile/tmp_file.h
@@ -5,7 +5,7 @@
 #include <string>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "sndfile_writer.h"
 #include "sndfile_reader.h"
diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc
index f96bd586d9..7e0b528d27 100644
--- a/libs/gtkmm2ext/bindings.cc
+++ b/libs/gtkmm2ext/bindings.cc
@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "pbd/xml++.h"
 #include "pbd/convert.h"
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 9091eb55f9..d1ef36ac2a 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -26,7 +26,7 @@
 #include <cerrno>
 #include <ctype.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <gtkmm/widget.h>
 #include <gtkmm/window.h>
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index a320acb63b..4f6977e4c3 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <stdio.h> /* for snprintf, grrr */
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtkmm.h>
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index a83d116d02..950880c0bf 100644
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #ifdef COMPILER_MINGW
 #include <io.h> // For W_OK
diff --git a/libs/pbd/test/filesystem_test.cc b/libs/pbd/test/filesystem_test.cc
index 31f6865afc..adff0c409b 100644
--- a/libs/pbd/test/filesystem_test.cc
+++ b/libs/pbd/test/filesystem_test.cc
@@ -1,7 +1,7 @@
 #include "filesystem_test.h"
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/libs/pbd/test/xml_test.cc b/libs/pbd/test/xml_test.cc
index c32cf96d4d..494c06794f 100644
--- a/libs/pbd/test/xml_test.cc
+++ b/libs/pbd/test/xml_test.cc
@@ -1,7 +1,7 @@
 #include "xml_test.h"
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 727485d83c..3312217531 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 
 #include <pbd/convert.h>