1 --- glibmm-2.48.1/glib/glibmm/dispatcher.cc.orig 2016-03-28 21:50:50.000000000 +0200
2 +++ glibmm-2.48.1/glib/glibmm/dispatcher.cc 2016-06-25 08:53:41.508797517 +0200
7 +#include <std-threads/mingw.mutex.h>
11 --- glibmm-2.48.1/glib/glibmm/objectbase.h.orig 2016-03-31 11:39:07.000000000 +0200
12 +++ glibmm-2.48.1/glib/glibmm/objectbase.h 2016-06-25 08:50:30.876496926 +0200
14 #include <map> // Needed until the next ABI break.
15 #include <memory> // Not used by ObjectBase any more, but user code may rely on it being here.
17 +#include <std-threads/mingw.mutex.h>
19 #ifndef DOXYGEN_SHOULD_SKIP_THIS
21 --- glibmm-2.48.1/glib/glibmm/thread.cc.orig 2016-03-31 11:13:59.000000000 +0200
22 +++ glibmm-2.48.1/glib/glibmm/thread.cc 2016-06-25 07:54:44.157960991 +0200
23 @@ -163,7 +163,7 @@ Thread::set_priority(ThreadPriority prio
25 Thread::get_priority() const
27 - return THREAD_PRIORITY_NORMAL; // An appropriate result now that this is deprecated because the
28 + return Glib::THREAD_PRIORITY_NORMAL; // An appropriate result now that this is deprecated because the
29 // priority concept has been removed.
32 --- glibmm-2.48.1/glib/glibmm/thread.h.orig 2016-03-31 11:13:59.000000000 +0200
33 +++ glibmm-2.48.1/glib/glibmm/thread.h 2016-06-25 08:51:22.762882501 +0200
36 /* Shadow THREAD_PRIORITY_NORMAL macro (from winbase.h).
38 +#include <windows.h> // ensure it's included before shadowing, not after
39 #if defined(THREAD_PRIORITY_NORMAL) && !defined(GLIBMM_MACRO_SHADOW_THREAD_PRIORITY_NORMAL)
40 enum { GLIBMM_MACRO_DEFINITION_THREAD_PRIORITY_NORMAL = THREAD_PRIORITY_NORMAL };
41 #undef THREAD_PRIORITY_NORMAL