Mercurial > mxe-octave
annotate src/glib-1-fixes.patch @ 2618:54ebb3d54d97
package glib: gitify patches
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Fri, 15 Jun 2012 15:41:53 +0200 |
parents | 7e5aaa010a02 |
children | 383ab5d1e69f |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1887
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
6 From 2a15b5d8c570d34e44d315116219bcd731054a54 Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
7 From: "a@mxe.cc" <a@mxe.cc> |
1219 | 8 Date: Thu, 23 Sep 2010 21:41:51 +0200 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
9 Subject: [PATCH 1/7] optional gettext |
1219 | 10 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
11 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
12 configure.ac | 4 ++-- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
13 glib/gi18n.h | 5 +++++ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
14 2 files changed, 7 insertions(+), 2 deletions(-) |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
15 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
16 diff --git a/configure.ac b/configure.ac |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
17 index cadd925..241284d 100644 |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 --- a/configure.ac |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 +++ b/configure.ac |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
20 @@ -479,8 +479,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
21 GLIB_GNU_GETTEXT |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 if test "$gt_cv_have_gettext" != "yes" ; then |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 - AC_MSG_ERROR([ |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
25 -*** You must have either have gettext support in your C library, or use the |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 + AC_MSG_WARN([ |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 +*** You should have either have gettext support in your C library, or use the |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 ]) |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 fi |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
31 diff --git a/glib/gi18n.h b/glib/gi18n.h |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 index c710046..269bfdf 100644 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
33 --- a/glib/gi18n.h |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 +++ b/glib/gi18n.h |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
35 @@ -22,7 +22,12 @@ |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
36 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
37 #include <glib.h> |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
38 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
39 +#ifdef ENABLE_NLS |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
40 #include <libintl.h> |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
41 +#else |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
42 +#define gettext(String) (String) |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
43 +#endif |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
44 + |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
45 #include <string.h> |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
47 #define _(String) gettext (String) |
1219 | 48 -- |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
49 1.7.10.4 |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
50 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
51 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
52 From 6e19d772238eb429fe0ea77b65dbc9d8a5d89afa Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
53 From: "a@mxe.cc" <a@mxe.cc> |
1219 | 54 Date: Thu, 23 Sep 2010 21:42:46 +0200 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
55 Subject: [PATCH 2/7] fix tool paths |
1219 | 56 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
57 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
58 glib-2.0.pc.in | 6 +++--- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
59 1 file changed, 3 insertions(+), 3 deletions(-) |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
60 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
61 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
62 index 4a8898e..5164bae 100644 |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
63 --- a/glib-2.0.pc.in |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
64 +++ b/glib-2.0.pc.in |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
65 @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
66 libdir=@libdir@ |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
67 includedir=@includedir@ |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
68 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
69 -glib_genmarshal=glib-genmarshal |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
70 -gobject_query=gobject-query |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
71 -glib_mkenums=glib-mkenums |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
72 +glib_genmarshal=@bindir@/glib-genmarshal |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
73 +gobject_query=@bindir@/gobject-query |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
74 +glib_mkenums=@bindir@/glib-mkenums |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
75 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
76 Name: GLib |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
77 Description: C Utility Library |
1219 | 78 -- |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
79 1.7.10.4 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
80 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
81 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
82 From 556504bac07f4d80c0d9e50be1090f3ae02a653b Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
83 From: Hans Petter Jansson <hpj@cl.no> |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
84 Date: Fri, 15 Jun 2012 15:25:01 +0200 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
85 Subject: [PATCH 3/7] Avoid DllMain symbol conflict when linking statically |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
86 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
87 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
88 gio/giomodule.c | 6 +----- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
89 glib/glib-init.c | 6 +++--- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
90 2 files changed, 4 insertions(+), 8 deletions(-) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
91 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
92 diff --git a/gio/giomodule.c b/gio/giomodule.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
93 index d8ce138..679279f 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
94 --- a/gio/giomodule.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
95 +++ b/gio/giomodule.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
96 @@ -782,10 +782,8 @@ extern GType _g_network_monitor_netlink_get_type (void); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
97 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
98 static HMODULE gio_dll = NULL; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
99 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
100 -#ifdef DLL_EXPORT |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
101 - |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
102 BOOL WINAPI |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
103 -DllMain (HINSTANCE hinstDLL, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
104 +gio_DllMain (HINSTANCE hinstDLL, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
105 DWORD fdwReason, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
106 LPVOID lpvReserved) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
107 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
108 @@ -801,8 +799,6 @@ _g_io_win32_get_module (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
109 return gio_dll; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
110 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
111 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
112 -#endif |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
113 - |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
114 #undef GIO_MODULE_DIR |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
115 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
116 /* GIO_MODULE_DIR is used only in code called just once, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
117 diff --git a/glib/glib-init.c b/glib/glib-init.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
118 index f4edd5c..02bf678 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
119 --- a/glib/glib-init.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
120 +++ b/glib/glib-init.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
121 @@ -226,9 +226,9 @@ glib_init (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
122 HMODULE glib_dll; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
123 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
124 BOOL WINAPI |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
125 -DllMain (HINSTANCE hinstDLL, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
126 - DWORD fdwReason, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
127 - LPVOID lpvReserved) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
128 +glib_DllMain (HINSTANCE hinstDLL, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
129 + DWORD fdwReason, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
130 + LPVOID lpvReserved) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
131 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
132 switch (fdwReason) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
133 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
134 -- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
135 1.7.10.4 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
136 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
137 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
138 From a83efeaa712bdfe43a1fcada6775ce2c89781631 Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
139 From: Hans Petter Jansson <hpj@cl.no> |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
140 Date: Fri, 15 Jun 2012 15:27:22 +0200 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
141 Subject: [PATCH 4/7] Allow building without inotify support |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
142 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
143 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
144 configure.ac | 13 ++++++++++--- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
145 1 file changed, 10 insertions(+), 3 deletions(-) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
146 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
147 diff --git a/configure.ac b/configure.ac |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
148 index 241284d..04d8590 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
149 --- a/configure.ac |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
150 +++ b/configure.ac |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
151 @@ -1700,11 +1700,18 @@ dnl ***************************** |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
152 dnl ** Check for inotify (GIO) ** |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
153 dnl ***************************** |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
154 inotify_support=no |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
155 -AC_CHECK_HEADERS([sys/inotify.h], |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
156 -[ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
157 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
158 +AC_ARG_ENABLE(inotify, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
159 + AC_HELP_STRING([--disable-inotify], |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
160 + [build without inotify support])) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
161 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
162 +if test "x$enable_inotify" != "xno"; then |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
163 + AC_CHECK_HEADERS([sys/inotify.h], |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
164 + [ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
165 inotify_support=yes |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
166 AC_CHECK_FUNCS(inotify_init1) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
167 -]) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
168 + ]) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
169 +fi |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
170 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
171 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
172 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
173 -- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
174 1.7.10.4 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
175 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
176 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
177 From e3d193f7e4f3d1ada0d65ccdccab1f28ef6d23d3 Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
178 From: Hans Petter Jansson <hpj@cl.no> |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
179 Date: Fri, 15 Jun 2012 15:28:14 +0200 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
180 Subject: [PATCH 5/7] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
181 Backported from upstream |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
182 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
183 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
184 configure.ac | 2 ++ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
185 1 file changed, 2 insertions(+) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
186 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
187 diff --git a/configure.ac b/configure.ac |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
188 index 04d8590..29b6252 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
189 --- a/configure.ac |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
190 +++ b/configure.ac |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
191 @@ -452,6 +452,8 @@ fi |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
192 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
193 AC_MSG_RESULT($enable_iconv_cache) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
194 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
195 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
196 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])]) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
197 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
198 dnl |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
199 dnl zlib support |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
200 -- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
201 1.7.10.4 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
202 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
203 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
204 From 08b493b8480f360ab21a0ce5c79b096392a389a8 Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
205 From: Hans Petter Jansson <hpj@cl.no> |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
206 Date: Fri, 15 Jun 2012 15:29:06 +0200 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
207 Subject: [PATCH 6/7] Link with dnsapi |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
208 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
209 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
210 gio-2.0.pc.in | 2 +- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
211 1 file changed, 1 insertion(+), 1 deletion(-) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
212 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
213 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
214 index 9f7123f..b0d5779 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
215 --- a/gio-2.0.pc.in |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
216 +++ b/gio-2.0.pc.in |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
217 @@ -13,6 +13,6 @@ Description: glib I/O library |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
218 Version: @VERSION@ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
219 Requires: glib-2.0 gobject-2.0 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
220 Requires.private: gmodule-no-export-2.0 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
221 -Libs: -L${libdir} -lgio-2.0 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
222 +Libs: -L${libdir} -lgio-2.0 -ldnsapi |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
223 Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
224 Cflags: |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
225 -- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
226 1.7.10.4 |
1190
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
227 |
821fabe85a36
upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
228 |
2618
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
229 From 645849d2055b1c7a46132a8b83739290b316ffba Mon Sep 17 00:00:00 2001 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
230 From: Hans Petter Jansson <hpj@cl.no> |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
231 Date: Fri, 15 Jun 2012 15:29:38 +0200 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
232 Subject: [PATCH 7/7] Ensure globals are initialized even when DllMain is not |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
233 being run |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
234 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
235 --- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
236 glib/gmain.c | 6 +++ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
237 glib/gthread-win32.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
238 2 files changed, 112 insertions(+) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
239 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
240 diff --git a/glib/gmain.c b/glib/gmain.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
241 index 760f179..878ac14 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
242 --- a/glib/gmain.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
243 +++ b/glib/gmain.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
244 @@ -1981,12 +1981,15 @@ g_get_real_time (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
245 #ifdef G_OS_WIN32 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
246 static ULONGLONG (*g_GetTickCount64) (void) = NULL; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
247 static guint32 g_win32_tick_epoch = 0; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
248 +static gboolean g_win32_clock_is_initialized; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
249 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
250 G_GNUC_INTERNAL void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
251 g_clock_win32_init (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
252 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
253 HMODULE kernel32; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
254 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
255 + g_win32_clock_is_initialized = TRUE; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
256 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
257 g_GetTickCount64 = NULL; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
258 kernel32 = GetModuleHandle ("KERNEL32.DLL"); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
259 if (kernel32 != NULL) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
260 @@ -2105,6 +2108,9 @@ g_get_monotonic_time (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
261 * timeBeginPeriod() to increase it as much as they want |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
262 */ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
263 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
264 + if (!g_win32_clock_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
265 + g_clock_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
266 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
267 if (g_GetTickCount64 != NULL) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
268 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
269 guint32 ticks_as_32bit; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
270 diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
271 index 5a9ac97..e4d1d48 100644 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
272 --- a/glib/gthread-win32.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
273 +++ b/glib/gthread-win32.c |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
274 @@ -117,18 +117,28 @@ typedef struct |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
275 void (__stdcall * WakeConditionVariable) (gpointer cond); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
276 } GThreadImplVtable; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
277 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
278 +/* Needed for static builds where DllMain initializer doesn't get called */ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
279 +static gboolean g_threads_is_initialized; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
280 +G_GNUC_INTERNAL void g_thread_win32_init (void); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
281 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
282 static GThreadImplVtable g_thread_impl_vtable; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
283 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
284 /* {{{1 GMutex */ |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
285 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
286 g_mutex_init (GMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
287 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
288 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
289 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
290 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
291 g_thread_impl_vtable.InitializeSRWLock (mutex); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
292 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
293 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
294 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
295 g_mutex_clear (GMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
296 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
297 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
298 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
299 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
300 if (g_thread_impl_vtable.DeleteSRWLock != NULL) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
301 g_thread_impl_vtable.DeleteSRWLock (mutex); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
302 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
303 @@ -136,18 +146,27 @@ g_mutex_clear (GMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
304 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
305 g_mutex_lock (GMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
306 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
307 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
308 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
309 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
310 g_thread_impl_vtable.AcquireSRWLockExclusive (mutex); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
311 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
312 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
313 gboolean |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
314 g_mutex_trylock (GMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
315 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
316 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
317 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
318 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
319 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
320 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
321 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
322 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
323 g_mutex_unlock (GMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
324 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
325 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
326 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
327 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
328 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
329 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
330 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
331 @@ -158,6 +177,9 @@ g_rec_mutex_impl_new (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
332 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
333 CRITICAL_SECTION *cs; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
334 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
335 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
336 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
337 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
338 cs = g_slice_new (CRITICAL_SECTION); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
339 InitializeCriticalSection (cs); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
340 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
341 @@ -168,6 +190,10 @@ static void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
342 g_rec_mutex_impl_free (CRITICAL_SECTION *cs) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
343 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
344 DeleteCriticalSection (cs); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
345 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
346 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
347 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
348 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
349 g_slice_free (CRITICAL_SECTION, cs); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
350 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
351 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
352 @@ -176,6 +202,9 @@ g_rec_mutex_get_impl (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
353 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
354 CRITICAL_SECTION *impl = mutex->p; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
355 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
356 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
357 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
358 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
359 if G_UNLIKELY (mutex->p == NULL) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
360 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
361 impl = g_rec_mutex_impl_new (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
362 @@ -190,30 +219,45 @@ g_rec_mutex_get_impl (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
363 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
364 g_rec_mutex_init (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
365 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
366 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
367 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
368 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
369 mutex->p = g_rec_mutex_impl_new (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
370 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
371 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
372 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
373 g_rec_mutex_clear (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
374 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
375 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
376 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
377 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
378 g_rec_mutex_impl_free (mutex->p); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
379 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
380 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
381 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
382 g_rec_mutex_lock (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
383 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
384 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
385 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
386 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
387 EnterCriticalSection (g_rec_mutex_get_impl (mutex)); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
388 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
389 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
390 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
391 g_rec_mutex_unlock (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
392 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
393 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
394 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
395 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
396 LeaveCriticalSection (mutex->p); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
397 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
398 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
399 gboolean |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
400 g_rec_mutex_trylock (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
401 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
402 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
403 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
404 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
405 return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex)); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
406 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
407 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
408 @@ -222,12 +266,18 @@ g_rec_mutex_trylock (GRecMutex *mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
409 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
410 g_rw_lock_init (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
411 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
412 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
413 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
414 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
415 g_thread_impl_vtable.InitializeSRWLock (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
416 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
417 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
418 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
419 g_rw_lock_clear (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
420 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
421 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
422 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
423 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
424 if (g_thread_impl_vtable.DeleteSRWLock != NULL) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
425 g_thread_impl_vtable.DeleteSRWLock (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
426 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
427 @@ -235,36 +285,54 @@ g_rw_lock_clear (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
428 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
429 g_rw_lock_writer_lock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
430 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
431 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
432 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
433 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
434 g_thread_impl_vtable.AcquireSRWLockExclusive (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
435 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
436 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
437 gboolean |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
438 g_rw_lock_writer_trylock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
439 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
440 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
441 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
442 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
443 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
444 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
445 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
446 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
447 g_rw_lock_writer_unlock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
448 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
449 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
450 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
451 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
452 g_thread_impl_vtable.ReleaseSRWLockExclusive (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
453 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
454 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
455 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
456 g_rw_lock_reader_lock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
457 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
458 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
459 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
460 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
461 g_thread_impl_vtable.AcquireSRWLockShared (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
462 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
463 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
464 gboolean |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
465 g_rw_lock_reader_trylock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
466 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
467 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
468 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
469 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
470 return g_thread_impl_vtable.TryAcquireSRWLockShared (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
471 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
472 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
473 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
474 g_rw_lock_reader_unlock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
475 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
476 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
477 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
478 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
479 g_thread_impl_vtable.ReleaseSRWLockShared (lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
480 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
481 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
482 @@ -272,12 +340,18 @@ g_rw_lock_reader_unlock (GRWLock *lock) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
483 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
484 g_cond_init (GCond *cond) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
485 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
486 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
487 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
488 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
489 g_thread_impl_vtable.InitializeConditionVariable (cond); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
490 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
491 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
492 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
493 g_cond_clear (GCond *cond) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
494 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
495 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
496 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
497 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
498 if (g_thread_impl_vtable.DeleteConditionVariable) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
499 g_thread_impl_vtable.DeleteConditionVariable (cond); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
500 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
501 @@ -285,12 +359,18 @@ g_cond_clear (GCond *cond) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
502 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
503 g_cond_signal (GCond *cond) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
504 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
505 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
506 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
507 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
508 g_thread_impl_vtable.WakeConditionVariable (cond); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
509 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
510 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
511 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
512 g_cond_broadcast (GCond *cond) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
513 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
514 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
515 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
516 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
517 g_thread_impl_vtable.WakeAllConditionVariable (cond); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
518 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
519 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
520 @@ -298,6 +378,9 @@ void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
521 g_cond_wait (GCond *cond, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
522 GMutex *entered_mutex) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
523 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
524 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
525 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
526 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
527 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
528 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
529 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
530 @@ -308,6 +391,9 @@ g_cond_wait_until (GCond *cond, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
531 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
532 gint64 span; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
533 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
534 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
535 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
536 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
537 span = end_time - g_get_monotonic_time (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
538 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
539 if G_UNLIKELY (span < 0) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
540 @@ -340,6 +426,9 @@ g_private_get_impl (GPrivate *key) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
541 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
542 if G_UNLIKELY (impl == 0) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
543 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
544 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
545 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
546 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
547 EnterCriticalSection (&g_private_lock); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
548 impl = (DWORD) key->p; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
549 if (impl == 0) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
550 @@ -433,6 +522,9 @@ g_system_thread_free (GRealThread *thread) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
551 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
552 GThreadWin32 *wt = (GThreadWin32 *) thread; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
553 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
554 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
555 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
556 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
557 win32_check_for_error (CloseHandle (wt->handle)); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
558 g_slice_free (GThreadWin32, wt); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
559 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
560 @@ -440,6 +532,9 @@ g_system_thread_free (GRealThread *thread) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
561 void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
562 g_system_thread_exit (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
563 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
564 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
565 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
566 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
567 _endthreadex (0); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
568 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
569 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
570 @@ -448,6 +543,9 @@ g_thread_win32_proxy (gpointer data) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
571 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
572 GThreadWin32 *self = data; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
573 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
574 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
575 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
576 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
577 self->proxy (self); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
578 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
579 g_system_thread_exit (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
580 @@ -465,6 +563,9 @@ g_system_thread_new (GThreadFunc func, |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
581 GThreadWin32 *thread; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
582 guint ignore; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
583 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
584 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
585 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
586 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
587 thread = g_slice_new0 (GThreadWin32); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
588 thread->proxy = func; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
589 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
590 @@ -494,6 +595,9 @@ g_system_thread_wait (GRealThread *thread) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
591 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
592 GThreadWin32 *wt = (GThreadWin32 *) thread; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
593 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
594 + if (!g_threads_is_initialized) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
595 + g_thread_win32_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
596 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
597 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE)); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
598 } |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
599 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
600 @@ -985,6 +1089,8 @@ g_thread_lookup_native_funcs (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
601 G_GNUC_INTERNAL void |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
602 g_thread_win32_init (void) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
603 { |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
604 + g_threads_is_initialized = TRUE; |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
605 + |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
606 if (!g_thread_lookup_native_funcs ()) |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
607 g_thread_xp_init (); |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
608 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
609 -- |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
610 1.7.10.4 |
54ebb3d54d97
package glib: gitify patches
Mark Brand <mabrand@mabrand.nl>
parents:
2615
diff
changeset
|
611 |