From bb6171bbb273c8ebe38a3bbb18b9e9a6f68a4b16 Mon Sep 17 00:00:00 2001 From: Franke Burgarino Date: Thu, 20 Nov 2025 13:38:18 -0600 Subject: [PATCH] glib version checks for MSYS --- gtk2_ardour/main.cc | 2 ++ libs/pbd/pbd.cc | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 3e827ac918..80a3c2dec6 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -261,9 +261,11 @@ int main (int argc, char *argv[]) load_custom_fonts(); /* needs to happen before any gtk and pango init calls */ +#if !GLIB_CHECK_VERSION(2,32,0) if (!Glib::thread_supported()) { Glib::thread_init(); } +#endif #ifdef LXVST_SUPPORT XInitThreads (); diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc index c19af3e462..44b04b9a78 100644 --- a/libs/pbd/pbd.cc +++ b/libs/pbd/pbd.cc @@ -28,7 +28,9 @@ #include +#if !GLIB_CHECK_VERSION(2,32,0) #include +#endif #include "pbd/pbd.h" #include "pbd/ccurl.h" @@ -87,11 +89,13 @@ PBD::init () } #endif +#if !GLIB_CHECK_VERSION(2,32,0) if (!Glib::thread_supported()) { Glib::thread_init(); } Gio::init (); +#endif PBD::ID::init ();