Mercurial > mxe-octave
annotate src/glib-1-fixes.patch @ 5895:2db7f803d55d release
librsb: Update to version 1.2.0.10 (bug #60042).
* src/librsb.mk: Update version and checksum. Remove work-around for fixed bug.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 19 Sep 2021 14:32:07 +0200 |
parents | ed74d76248b7 |
children | 6c9c51be6829 |
rev | line source |
---|---|
4993
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 This file is part of MXE. See LICENSE.md for licensing information. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 Contains ad hoc patches for cross building. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 From: Mark Brand <mabrand@mabrand.nl> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 Date: Thu, 23 Sep 2010 21:42:46 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 Subject: [PATCH 1/9] fix tool paths |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 --- a/glib-2.0.pc.in |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 +++ b/glib-2.0.pc.in |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 libdir=@libdir@ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 includedir=@includedir@ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 -glib_genmarshal=glib-genmarshal |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 -gobject_query=gobject-query |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 -glib_mkenums=glib-mkenums |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 +glib_genmarshal=@bindir@/glib-genmarshal |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 +gobject_query=@bindir@/gobject-query |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 +glib_mkenums=@bindir@/glib-mkenums |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 Name: GLib |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 Description: C Utility Library |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 From: Hans Petter Jansson <hpj@cl.no> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 Date: Fri, 15 Jun 2012 15:25:01 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 Subject: [PATCH 2/9] Avoid DllMain symbol conflict when linking statically |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 Adjusted by Boris Nagaev on 29-Jan-2017 to fix |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 https://gist.github.com/starius/f4fc85939352cb50122ba29e0f5b140d |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 when updating to glib-2.50.2. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 diff --git a/gio/giomodule.c b/gio/giomodule.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 --- a/gio/giomodule.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 +++ b/gio/giomodule.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 @@ -928,14 +928,12 @@ extern GType g_cocoa_notification_backend_get_type (void); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 static HMODULE gio_dll = NULL; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 -#ifdef DLL_EXPORT |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 - |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 -BOOL WINAPI DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 +BOOL WINAPI gio_DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 DWORD fdwReason, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 LPVOID lpvReserved); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 BOOL WINAPI |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 -DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
55 +gio_DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
56 DWORD fdwReason, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
57 LPVOID lpvReserved) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
58 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
59 @@ -945,8 +943,6 @@ DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
60 return TRUE; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
61 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
62 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
63 -#endif |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
64 - |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
65 void * |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
66 _g_io_win32_get_module (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
67 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
68 diff --git a/glib/glib-init.c b/glib/glib-init.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
69 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
70 --- a/glib/glib-init.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
71 +++ b/glib/glib-init.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
72 @@ -245,14 +245,14 @@ glib_init (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
73 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
74 #if defined (G_OS_WIN32) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
75 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
76 -BOOL WINAPI DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
77 +BOOL WINAPI glib_DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
78 DWORD fdwReason, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
79 LPVOID lpvReserved); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
80 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
81 HMODULE glib_dll; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
82 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
83 BOOL WINAPI |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
84 -DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
85 +glib_DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
86 DWORD fdwReason, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
87 LPVOID lpvReserved) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
88 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
89 diff --git a/gobject/gtype.c b/gobject/gtype.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
90 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
91 --- a/gobject/gtype.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
92 +++ b/gobject/gtype.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
93 @@ -4450,7 +4450,7 @@ gobject_init (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
94 _g_signal_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
95 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
96 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
97 -#if defined (G_OS_WIN32) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
98 +#if 0 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
99 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
100 BOOL WINAPI DllMain (HINSTANCE hinstDLL, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
101 DWORD fdwReason, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
102 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
103 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
104 From: Hans Petter Jansson <hpj@cl.no> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
105 Date: Fri, 15 Jun 2012 15:27:22 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
106 Subject: [PATCH 3/9] Allow building without inotify support |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
107 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
108 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
109 diff --git a/configure.ac b/configure.ac |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
110 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
111 --- a/configure.ac |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
112 +++ b/configure.ac |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
113 @@ -1599,10 +1599,16 @@ dnl ***************************** |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
114 dnl ** Check for inotify (GIO) ** |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
115 dnl ***************************** |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
116 inotify_support=no |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
117 + AC_ARG_ENABLE(inotify, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
118 + AC_HELP_STRING([--disable-inotify], |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
119 + [build without inotify support])) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
120 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
121 + if test "x$enable_inotify" != "xno"; then |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
122 AC_CHECK_HEADERS([sys/inotify.h], |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
123 [ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
124 AC_CHECK_FUNCS(inotify_init1, [inotify_support=yes], [inotify_support=no]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
125 ]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
126 +fi |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
127 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
128 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
129 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
130 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
131 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
132 From: Hans Petter Jansson <hpj@cl.no> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
133 Date: Fri, 15 Jun 2012 15:28:14 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
134 Subject: [PATCH 4/9] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
135 Backported from upstream |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
136 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
137 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
138 diff --git a/configure.ac b/configure.ac |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
139 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
140 --- a/configure.ac |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
141 +++ b/configure.ac |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
142 @@ -511,6 +511,8 @@ LT_INIT([disable-static win32-dll]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
143 dnl when using libtool 2.x create libtool early, because it's used in configure |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
144 m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
145 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
146 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
147 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
148 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
149 AS_IF([test "$glib_native_win32" = "yes"], [ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
150 if test x$enable_static = xyes -a x$enable_shared = xyes; then |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
151 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
152 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
153 From: Hans Petter Jansson <hpj@cl.no> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
154 Date: Fri, 15 Jun 2012 15:29:06 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
155 Subject: [PATCH 5/9] Link with dnsapi |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
156 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
157 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
158 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
159 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
160 --- a/gio-2.0.pc.in |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
161 +++ b/gio-2.0.pc.in |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
162 @@ -13,6 +13,6 @@ Description: glib I/O library |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
163 Version: @VERSION@ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
164 Requires: glib-2.0 gobject-2.0 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
165 Requires.private: gmodule-no-export-2.0 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
166 -Libs: -L${libdir} -lgio-2.0 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
167 +Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
168 Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
169 Cflags: |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
170 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
171 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
172 From: Hans Petter Jansson <hpj@cl.no> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
173 Date: Fri, 15 Jun 2012 15:29:38 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
174 Subject: [PATCH 6/9] Ensure globals are initialized even when DllMain is not |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
175 being run |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
176 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
177 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
178 diff --git a/glib/gmain.c b/glib/gmain.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
179 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
180 --- a/glib/gmain.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
181 +++ b/glib/gmain.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
182 @@ -2657,12 +2657,15 @@ g_get_real_time (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
183 #if defined (G_OS_WIN32) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
184 static ULONGLONG (*g_GetTickCount64) (void) = NULL; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
185 static guint32 g_win32_tick_epoch = 0; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
186 +static gboolean g_win32_clock_is_initialized; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
187 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
188 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
189 g_clock_win32_init (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
190 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
191 HMODULE kernel32; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
192 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
193 + g_win32_clock_is_initialized = TRUE; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
194 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
195 g_GetTickCount64 = NULL; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
196 kernel32 = GetModuleHandle ("KERNEL32.DLL"); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
197 if (kernel32 != NULL) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
198 @@ -2721,6 +2724,9 @@ g_get_monotonic_time (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
199 * timeBeginPeriod() to increase it as much as they want |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
200 */ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
201 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
202 + if (!g_win32_clock_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
203 + g_clock_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
204 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
205 if (g_GetTickCount64 != NULL) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
206 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
207 guint32 ticks_as_32bit; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
208 diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
209 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
210 --- a/glib/gthread-win32.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
211 +++ b/glib/gthread-win32.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
212 @@ -116,18 +116,28 @@ typedef struct |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
213 void (__stdcall * WakeConditionVariable) (gpointer cond); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
214 } GThreadImplVtable; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
215 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
216 +/* Needed for static builds where DllMain initializer doesn't get called */ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
217 +static gboolean g_threads_is_initialized; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
218 +G_GNUC_INTERNAL void g_thread_win32_init (void); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
219 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
220 static GThreadImplVtable g_thread_impl_vtable; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
221 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
222 /* {{{1 GMutex */ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
223 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
224 g_mutex_init (GMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
225 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
226 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
227 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
228 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
229 g_thread_impl_vtable.InitializeSRWLock (mutex); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
230 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
231 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
232 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
233 g_mutex_clear (GMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
234 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
235 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
236 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
237 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
238 if (g_thread_impl_vtable.DeleteSRWLock != NULL) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
239 g_thread_impl_vtable.DeleteSRWLock (mutex); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
240 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
241 @@ -135,18 +145,27 @@ g_mutex_clear (GMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
242 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
243 g_mutex_lock (GMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
244 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
245 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
246 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
247 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
248 g_thread_impl_vtable.AcquireSRWLockExclusive (mutex); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
249 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
250 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
251 gboolean |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
252 g_mutex_trylock (GMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
253 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
254 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
255 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
256 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
257 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
258 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
259 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
260 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
261 g_mutex_unlock (GMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
262 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
263 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
264 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
265 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
266 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
267 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
268 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
269 @@ -157,6 +176,9 @@ g_rec_mutex_impl_new (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
270 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
271 CRITICAL_SECTION *cs; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
272 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
273 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
274 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
275 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
276 cs = g_slice_new (CRITICAL_SECTION); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
277 InitializeCriticalSection (cs); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
278 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
279 @@ -167,6 +189,10 @@ static void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
280 g_rec_mutex_impl_free (CRITICAL_SECTION *cs) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
281 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
282 DeleteCriticalSection (cs); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
283 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
284 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
285 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
286 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
287 g_slice_free (CRITICAL_SECTION, cs); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
288 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
289 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
290 @@ -175,6 +201,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
291 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
292 CRITICAL_SECTION *impl = mutex->p; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
293 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
294 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
295 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
296 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
297 if G_UNLIKELY (mutex->p == NULL) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
298 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
299 impl = g_rec_mutex_impl_new (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
300 @@ -189,30 +218,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
301 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
302 g_rec_mutex_init (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
303 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
304 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
305 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
306 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
307 mutex->p = g_rec_mutex_impl_new (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
308 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
309 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
310 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
311 g_rec_mutex_clear (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
312 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
313 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
314 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
315 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
316 g_rec_mutex_impl_free (mutex->p); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
317 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
318 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
319 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
320 g_rec_mutex_lock (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
321 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
322 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
323 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
324 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
325 EnterCriticalSection (g_rec_mutex_get_impl (mutex)); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
326 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
327 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
328 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
329 g_rec_mutex_unlock (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
330 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
331 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
332 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
333 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
334 LeaveCriticalSection (mutex->p); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
335 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
336 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
337 gboolean |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
338 g_rec_mutex_trylock (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
339 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
340 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
341 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
342 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
343 return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex)); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
344 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
345 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
346 @@ -221,12 +265,18 @@ g_rec_mutex_trylock (GRecMutex *mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
347 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
348 g_rw_lock_init (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
349 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
350 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
351 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
352 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
353 g_thread_impl_vtable.InitializeSRWLock (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
354 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
355 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
356 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
357 g_rw_lock_clear (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
358 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
359 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
360 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
361 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
362 if (g_thread_impl_vtable.DeleteSRWLock != NULL) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
363 g_thread_impl_vtable.DeleteSRWLock (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
364 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
365 @@ -234,36 +284,54 @@ g_rw_lock_clear (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
366 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
367 g_rw_lock_writer_lock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
368 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
369 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
370 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
371 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
372 g_thread_impl_vtable.AcquireSRWLockExclusive (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
373 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
374 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
375 gboolean |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
376 g_rw_lock_writer_trylock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
377 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
378 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
379 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
380 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
381 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
382 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
383 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
384 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
385 g_rw_lock_writer_unlock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
386 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
387 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
388 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
389 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
390 g_thread_impl_vtable.ReleaseSRWLockExclusive (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
391 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
392 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
393 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
394 g_rw_lock_reader_lock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
395 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
396 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
397 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
398 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
399 g_thread_impl_vtable.AcquireSRWLockShared (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
400 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
401 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
402 gboolean |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
403 g_rw_lock_reader_trylock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
404 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
405 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
406 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
407 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
408 return g_thread_impl_vtable.TryAcquireSRWLockShared (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
409 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
410 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
411 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
412 g_rw_lock_reader_unlock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
413 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
414 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
415 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
416 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
417 g_thread_impl_vtable.ReleaseSRWLockShared (lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
418 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
419 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
420 @@ -271,12 +339,18 @@ g_rw_lock_reader_unlock (GRWLock *lock) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
421 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
422 g_cond_init (GCond *cond) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
423 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
424 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
425 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
426 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
427 g_thread_impl_vtable.InitializeConditionVariable (cond); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
428 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
429 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
430 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
431 g_cond_clear (GCond *cond) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
432 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
433 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
434 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
435 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
436 if (g_thread_impl_vtable.DeleteConditionVariable) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
437 g_thread_impl_vtable.DeleteConditionVariable (cond); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
438 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
439 @@ -284,12 +358,18 @@ g_cond_clear (GCond *cond) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
440 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
441 g_cond_signal (GCond *cond) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
442 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
443 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
444 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
445 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
446 g_thread_impl_vtable.WakeConditionVariable (cond); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
447 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
448 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
449 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
450 g_cond_broadcast (GCond *cond) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
451 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
452 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
453 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
454 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
455 g_thread_impl_vtable.WakeAllConditionVariable (cond); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
456 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
457 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
458 @@ -297,6 +377,9 @@ void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
459 g_cond_wait (GCond *cond, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
460 GMutex *entered_mutex) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
461 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
462 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
463 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
464 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
465 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
466 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
467 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
468 @@ -307,6 +390,9 @@ g_cond_wait_until (GCond *cond, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
469 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
470 gint64 span; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
471 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
472 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
473 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
474 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
475 span = end_time - g_get_monotonic_time (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
476 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
477 if G_UNLIKELY (span < 0) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
478 @@ -339,6 +425,9 @@ g_private_get_impl (GPrivate *key) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
479 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
480 if G_UNLIKELY (impl == 0) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
481 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
482 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
483 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
484 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
485 EnterCriticalSection (&g_private_lock); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
486 impl = (DWORD) key->p; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
487 if (impl == 0) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
488 @@ -432,6 +521,9 @@ g_system_thread_free (GRealThread *thread) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
489 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
490 GThreadWin32 *wt = (GThreadWin32 *) thread; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
491 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
492 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
493 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
494 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
495 win32_check_for_error (CloseHandle (wt->handle)); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
496 g_slice_free (GThreadWin32, wt); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
497 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
498 @@ -439,6 +531,9 @@ g_system_thread_free (GRealThread *thread) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
499 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
500 g_system_thread_exit (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
501 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
502 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
503 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
504 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
505 _endthreadex (0); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
506 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
507 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
508 @@ -447,6 +542,9 @@ g_thread_win32_proxy (gpointer data) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
509 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
510 GThreadWin32 *self = data; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
511 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
512 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
513 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
514 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
515 self->proxy (self); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
516 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
517 g_system_thread_exit (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
518 @@ -464,6 +562,9 @@ g_system_thread_new (GThreadFunc func, |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
519 GThreadWin32 *thread; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
520 guint ignore; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
521 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
522 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
523 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
524 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
525 thread = g_slice_new0 (GThreadWin32); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
526 thread->proxy = func; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
527 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
528 @@ -493,6 +594,9 @@ g_system_thread_wait (GRealThread *thread) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
529 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
530 GThreadWin32 *wt = (GThreadWin32 *) thread; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
531 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
532 + if (!g_threads_is_initialized) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
533 + g_thread_win32_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
534 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
535 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE)); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
536 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
537 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
538 @@ -1041,6 +1145,8 @@ g_thread_lookup_native_funcs (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
539 void |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
540 g_thread_win32_init (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
541 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
542 + g_threads_is_initialized = TRUE; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
543 + |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
544 if (!g_thread_lookup_native_funcs ()) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
545 g_thread_xp_init (); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
546 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
547 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
548 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
549 From: Gerardo Ballabio <gerardo.ballabio@gmail.com> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
550 Date: Sun, 16 Aug 2015 13:18:24 +0200 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
551 Subject: [PATCH 7/9] Remove an annoying runtime warning |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
552 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
553 that pops up when using GtkApplication in Gtk+ 3 programs. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
554 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
555 diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
556 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
557 --- a/gio/gdbusaddress.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
558 +++ b/gio/gdbusaddress.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
559 @@ -1387,6 +1387,7 @@ __declspec(dllexport) void CALLBACK g_win32_run_session_bus (HWND hwnd, HINSTANC |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
560 __declspec(dllexport) void CALLBACK |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
561 g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
562 { |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
563 + /* |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
564 GDBusDaemon *daemon; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
565 GMainLoop *loop; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
566 const char *address; |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
567 @@ -1418,6 +1419,7 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
568 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
569 g_main_loop_unref (loop); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
570 g_object_unref (daemon); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
571 + */ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
572 } |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
573 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
574 static gchar * |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
575 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
576 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
577 From: aquiles2k <aj@elane2k.com> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
578 Date: Wed, 6 Apr 2016 22:39:53 +0300 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
579 Subject: [PATCH 8/9] fix error "won't overwrite defined macro" on OSX |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
580 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
581 See https://github.com/mxe/mxe/issues/1281 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
582 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
583 diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
584 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
585 --- a/m4macros/glib-gettext.m4 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
586 +++ b/m4macros/glib-gettext.m4 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
587 @@ -36,8 +36,8 @@ dnl We go to great lengths to make sure that aclocal won't |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
588 dnl try to pull in the installed version of these macros |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
589 dnl when running aclocal in the glib directory. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
590 dnl |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
591 -m4_copy([AC_DEFUN],[glib_DEFUN]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
592 -m4_copy([AC_REQUIRE],[glib_REQUIRE]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
593 +m4_copy_force([AC_DEFUN],[glib_DEFUN]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
594 +m4_copy_force([AC_REQUIRE],[glib_REQUIRE]) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
595 dnl |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
596 dnl At the end, if we're not within glib, we'll define the public |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
597 dnl definitions in terms of our private definitions. |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
598 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
599 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
600 From: Tony Theodore <tonyt@logyst.com> |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
601 Date: Mon, 26 Feb 2018 16:09:53 +1100 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
602 Subject: [PATCH 9/9] darwin: disable g_cocoa_notification_backend |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
603 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
604 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
605 diff --git a/gio/Makefile.am b/gio/Makefile.am |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
606 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
607 --- a/gio/Makefile.am |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
608 +++ b/gio/Makefile.am |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
609 @@ -279,10 +279,6 @@ unix_sources = \ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
610 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
611 appinfo_sources += $(unix_appinfo_sources) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
612 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
613 -if OS_COCOA |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
614 -unix_sources += gcocoanotificationbackend.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
615 -endif |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
616 - |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
617 giounixincludedir=$(includedir)/gio-unix-2.0/gio |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
618 giounixinclude_HEADERS = \ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
619 gdesktopappinfo.h \ |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
620 diff --git a/gio/giomodule.c b/gio/giomodule.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
621 index 1111111..2222222 100644 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
622 --- a/gio/giomodule.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
623 +++ b/gio/giomodule.c |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
624 @@ -918,9 +918,6 @@ extern GType g_proxy_resolver_portal_get_type (void); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
625 extern GType g_network_monitor_portal_get_type (void); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
626 #endif |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
627 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
628 -#ifdef HAVE_COCOA |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
629 -extern GType g_cocoa_notification_backend_get_type (void); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
630 -#endif |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
631 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
632 #ifdef G_PLATFORM_WIN32 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
633 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
634 @@ -1117,9 +1114,6 @@ _g_io_modules_ensure_loaded (void) |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
635 g_type_ensure (g_network_monitor_portal_get_type ()); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
636 g_type_ensure (g_proxy_resolver_portal_get_type ()); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
637 #endif |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
638 -#ifdef HAVE_COCOA |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
639 - g_type_ensure (g_cocoa_notification_backend_get_type ()); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
640 -#endif |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
641 #ifdef G_OS_WIN32 |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
642 g_type_ensure (_g_winhttp_vfs_get_type ()); |
7e89d17a530c
Update glib to v2.50.2 (bug #55769).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
643 #endif |
5123
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
644 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
645 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
646 From: Ernestas Kulik <ekulik@redhat.com> |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
647 Date: Tue, 29 Jan 2019 09:50:46 +0100 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
648 Subject: [PATCH 10/10] gdbus: Avoid printing null strings |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
649 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
650 This mostly affects the 2.56 branch, but, given that GCC 9 is being |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
651 stricter about passing null string pointers to printf-like functions, it |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
652 might make sense to proactively fix such calls. |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
653 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
654 gdbusauth.c: In function '_g_dbus_auth_run_server': |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
655 gdbusauth.c:1302:11: error: '%s' directive argument is null |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
656 [-Werror=format-overflow=] |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
657 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
658 line); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
659 | |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
660 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
661 gdbusmessage.c: In function ‘g_dbus_message_to_blob’: |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
662 gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=] |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
663 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
664 | |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
665 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
666 diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
667 index 1111111..2222222 100644 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
668 --- a/gio/gdbusauth.c |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
669 +++ b/gio/gdbusauth.c |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
670 @@ -1295,9 +1295,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
671 &line_length, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
672 cancellable, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
673 error); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
674 - debug_print ("SERVER: WaitingForBegin, read '%s'", line); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
675 if (line == NULL) |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
676 goto out; |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
677 + debug_print ("SERVER: WaitingForBegin, read '%s'", line); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
678 if (g_strcmp0 (line, "BEGIN") == 0) |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
679 { |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
680 /* YAY, done! */ |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
681 diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
682 index 1111111..2222222 100644 |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
683 --- a/gio/gdbusmessage.c |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
684 +++ b/gio/gdbusmessage.c |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
685 @@ -2695,7 +2695,6 @@ g_dbus_message_to_blob (GDBusMessage *message, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
686 if (message->body != NULL) |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
687 { |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
688 gchar *tupled_signature_str; |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
689 - tupled_signature_str = g_strdup_printf ("(%s)", signature_str); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
690 if (signature == NULL) |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
691 { |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
692 g_set_error (error, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
693 @@ -2703,10 +2702,10 @@ g_dbus_message_to_blob (GDBusMessage *message, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
694 G_IO_ERROR_INVALID_ARGUMENT, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
695 _("Message body has signature '%s' but there is no signature header"), |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
696 signature_str); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
697 - g_free (tupled_signature_str); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
698 goto out; |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
699 } |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
700 - else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
701 + tupled_signature_str = g_strdup_printf ("(%s)", signature_str); |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
702 + if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
703 { |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
704 g_set_error (error, |
ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
John Donoghue
parents:
4993
diff
changeset
|
705 G_IO_ERROR, |