Merge remote-tracking branch 'origin/master' into gtk3

2017-01-31 00:30:48 +01:00
parent 16f4731e0b 9ce41d8e91
commit 373e93ad4a
2 changed files with 0 additions and 5 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -85,11 +85,7 @@ Glib::ustring fname_to_utf8 (const char* fname)
 }

 // This recursive mutex will be used by gdk_threads_enter/leave instead of a simple mutex
-#ifdef WIN32
-static Glib::RecMutex myGdkRecMutex;
-#else
 static Glib::Threads::RecMutex myGdkRecMutex;
-#endif

 static void myGdkLockEnter()
 {