mxe-octave: src/mingw-glib-1-fixes.patch annotate

annotate src/mingw-glib-1-fixes.patch @ 4291:436a81e04861

glib: update to v2.48.1 * src/glib.mk: update version, checksum * src/mingw-glib-1-fixes.patch: update patch

author	John D
date	Sun, 25 Dec 2016 18:51:46 -0500
parents	96e96221fe09
children

rev	line source
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	1 diff -ur glib-2.48.1.orig/autogen.sh glib-2.48.1/autogen.sh
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	2 --- glib-2.48.1.orig/autogen.sh 2016-12-25 13:21:25.730080418 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	3 +++ glib-2.48.1/autogen.sh 2016-12-25 13:22:17.474289395 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	4 @@ -7,18 +7,6 @@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	5 olddir=`pwd`
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	6 cd "$srcdir"
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	7
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	8 -GTKDOCIZE=$(which gtkdocize 2>/dev/null)
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	9 -if test -z $GTKDOCIZE; then
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	10 - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	11 - rm -f gtk-doc.make
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	12 - cat > gtk-doc.make <<EOF
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	13 -EXTRA_DIST =
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	14 -CLEANFILES =
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	15 -EOF
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	16 -else
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	17 - gtkdocize \|\| exit $?
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	18 -fi
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	19 -
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	20 AUTORECONF=`which autoreconf`
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	21 if test -z $AUTORECONF; then
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	22 echo "* No autoreconf found, please install it *"
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	23 diff -ur glib-2.48.1.orig/configure.ac glib-2.48.1/configure.ac
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	24 --- glib-2.48.1.orig/configure.ac 2016-12-25 13:21:25.725080302 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	25 +++ glib-2.48.1/configure.ac 2016-12-25 13:22:17.472289348 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	26 @@ -465,8 +465,8 @@
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	27 GLIB_GNU_GETTEXT
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	28
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	29 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	30 - AC_MSG_ERROR([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	31 -*** 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	32 + AC_MSG_WARN([
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	33 +*** You should have either have gettext support in your C library, or use the
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	34 *** 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	35 ])
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	36 fi
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	37 @@ -509,6 +509,8 @@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	38 dnl when using libtool 2.x create libtool early, because it's used in configure
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	39 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	40
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	41 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	42 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])])
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	43
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	44 AS_IF([test "$glib_native_win32" = "yes"], [
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	45 if test x$enable_static = xyes -a x$enable_shared = xyes; then
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	46 Only in glib-2.48.1: configure.ac.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	47 Only in glib-2.48.1: configure.ac.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	48 Only in glib-2.48.1/docs: Makefile.am.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	49 Only in glib-2.48.1/docs: Makefile.am.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	50 Only in glib-2.48.1/docs/reference/gio: gdbus-object-manager-example
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	51 Only in glib-2.48.1/docs/reference/gio: Makefile.am.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	52 Only in glib-2.48.1/docs/reference/gio: Makefile.am.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	53 Only in glib-2.48.1/docs/reference/glib: Makefile.am.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	54 Only in glib-2.48.1/docs/reference/glib: Makefile.am.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	55 Only in glib-2.48.1/docs/reference/gobject: Makefile.am.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	56 Only in glib-2.48.1/docs/reference/gobject: Makefile.am.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	57 Only in glib-2.48.1/docs/reference: Makefile.am.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	58 Only in glib-2.48.1/docs/reference: Makefile.am.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	59 diff -ur glib-2.48.1.orig/gio/giomodule.c glib-2.48.1/gio/giomodule.c
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	60 --- glib-2.48.1.orig/gio/giomodule.c 2016-12-25 13:21:25.751080909 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	61 +++ glib-2.48.1/gio/giomodule.c 2016-12-25 13:22:17.470289301 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	62 @@ -921,14 +921,12 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	63
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	64 static HMODULE gio_dll = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	65
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	66 -#ifdef DLL_EXPORT
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	67 -
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	68 -BOOL WINAPI DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	69 +BOOL WINAPI gio_DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	70 DWORD fdwReason,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	71 LPVOID lpvReserved);
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	72
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	73 BOOL WINAPI
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	74 -DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	75 +gio_DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	76 DWORD fdwReason,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	77 LPVOID lpvReserved)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	78 {
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	79 @@ -938,8 +936,6 @@
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	80 return TRUE;
2618 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
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	83 -#endif
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	84 -
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	85 void *
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	86 _g_io_win32_get_module (void)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	87 {
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	88 Only in glib-2.48.1/gio: giomodule.c.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	89 Only in glib-2.48.1: gio-2.0.pc.in.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	90 Only in glib-2.48.1: gio-2.0.pc.in.rej
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	91 diff -ur glib-2.48.1.orig/glib/gi18n.h glib-2.48.1/glib/gi18n.h
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	92 --- glib-2.48.1.orig/glib/gi18n.h 2016-12-25 13:21:25.775081470 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	93 +++ glib-2.48.1/glib/gi18n.h 2016-12-25 13:22:17.469289278 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	94 @@ -20,7 +20,12 @@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	95
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	96 #include <glib.h>
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	97
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	98 +#ifdef ENABLE_NLS
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	99 #include <libintl.h>
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	100 +#else
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	101 +#define gettext(String) (String)
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	102 +#endif
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	103 +
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	104 #include <string.h>
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	105
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	106 #define _(String) gettext (String)
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	107 Only in glib-2.48.1/glib: gi18n.h.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	108 diff -ur glib-2.48.1.orig/glib/glib-init.c glib-2.48.1/glib/glib-init.c
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	109 --- glib-2.48.1.orig/glib/glib-init.c 2016-12-25 13:21:25.780081587 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	110 +++ glib-2.48.1/glib/glib-init.c 2016-12-25 13:22:17.470289301 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	111 @@ -245,14 +245,14 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	112
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	113 #if defined (G_OS_WIN32)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	114
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	115 -BOOL WINAPI DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	116 +BOOL WINAPI glib_DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	117 DWORD fdwReason,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	118 LPVOID lpvReserved);
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	119
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	120 HMODULE glib_dll;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	121
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	122 BOOL WINAPI
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	123 -DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	124 +glib_DllMain (HINSTANCE hinstDLL,
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	125 DWORD fdwReason,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	126 LPVOID lpvReserved)
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	127 {
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	128 Only in glib-2.48.1/glib: glib-init.c.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	129 diff -ur glib-2.48.1.orig/glib/gmain.c glib-2.48.1/glib/gmain.c
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	130 --- glib-2.48.1.orig/glib/gmain.c 2016-12-25 13:21:25.793081890 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	131 +++ glib-2.48.1/glib/gmain.c 2016-12-25 13:22:17.473289371 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	132 @@ -2609,12 +2609,15 @@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	133 #if defined (G_OS_WIN32)
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	134 static ULONGLONG (*g_GetTickCount64) (void) = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	135 static guint32 g_win32_tick_epoch = 0;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	136 +static gboolean g_win32_clock_is_initialized;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	137
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	138 void
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	139 g_clock_win32_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	140 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	141 HMODULE kernel32;
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 + g_win32_clock_is_initialized = TRUE;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	144 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	145 g_GetTickCount64 = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	146 kernel32 = GetModuleHandle ("KERNEL32.DLL");
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	147 if (kernel32 != NULL)
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	148 @@ -2673,6 +2676,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	149 * timeBeginPeriod() to increase it as much as they want
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	150 */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	151
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	152 + if (!g_win32_clock_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	153 + g_clock_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	154 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	155 if (g_GetTickCount64 != NULL)
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 guint32 ticks_as_32bit;
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	158 Only in glib-2.48.1/glib: gmain.c.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	159 diff -ur glib-2.48.1.orig/glib/gstrfuncs.c glib-2.48.1/glib/gstrfuncs.c
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	160 --- glib-2.48.1.orig/glib/gstrfuncs.c 2016-12-25 13:21:25.797081984 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	161 +++ glib-2.48.1/glib/gstrfuncs.c 2016-12-25 14:23:07.518480108 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	162 @@ -1272,7 +1272,7 @@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	163 gchar buf[1024];
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	164 GError *error = NULL;
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	165
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	166 -#if defined(G_OS_WIN32)
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	167 +#if defined(G_OS_WIN32) && !defined(__MINGW32__)
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	168 strerror_s (buf, sizeof (buf), errnum);
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	169 msg = buf;
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	170 #elif defined(HAVE_STRERROR_R)
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	171 diff -ur glib-2.48.1.orig/glib/gthread-win32.c glib-2.48.1/glib/gthread-win32.c
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	172 --- glib-2.48.1.orig/glib/gthread-win32.c 2016-12-25 13:21:25.780081587 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	173 +++ glib-2.48.1/glib/gthread-win32.c 2016-12-25 13:22:17.474289395 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	174 @@ -116,18 +116,28 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	175 void (__stdcall * WakeConditionVariable) (gpointer cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	176 } GThreadImplVtable;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	177
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	178 +/* 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	179 +static gboolean g_threads_is_initialized;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	180 +G_GNUC_INTERNAL void g_thread_win32_init (void);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	181 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	182 static GThreadImplVtable g_thread_impl_vtable;
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 /* {{{1 GMutex */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	185 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	186 g_mutex_init (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	187 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	188 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	189 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	190 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	191 g_thread_impl_vtable.InitializeSRWLock (mutex);
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
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	194 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	195 g_mutex_clear (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	196 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	197 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	198 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	199 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	200 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	201 g_thread_impl_vtable.DeleteSRWLock (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	202 }
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	203 @@ -135,18 +145,27 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	204 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	205 g_mutex_lock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	206 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	207 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	208 + g_thread_win32_init ();
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 g_thread_impl_vtable.AcquireSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	211 }
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 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	214 g_mutex_trylock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	215 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	216 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	217 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	218 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	219 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	220 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	221
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	222 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	223 g_mutex_unlock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	224 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	225 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	226 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	227 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	228 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	229 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	230
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	231 @@ -157,6 +176,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	232 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	233 CRITICAL_SECTION *cs;
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	236 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	237 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	238 cs = g_slice_new (CRITICAL_SECTION);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	239 InitializeCriticalSection (cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	240
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	241 @@ -167,6 +189,10 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	242 g_rec_mutex_impl_free (CRITICAL_SECTION *cs)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	243 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	244 DeleteCriticalSection (cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	245 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	246 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	247 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	248 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	249 g_slice_free (CRITICAL_SECTION, cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	250 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	251
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	252 @@ -175,6 +201,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	253 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	254 CRITICAL_SECTION *impl = mutex->p;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	255
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	256 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	257 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	258 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	259 if G_UNLIKELY (mutex->p == NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	260 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	261 impl = g_rec_mutex_impl_new ();
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	262 @@ -189,30 +218,45 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	263 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	264 g_rec_mutex_init (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	265 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	266 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	267 + g_thread_win32_init ();
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 mutex->p = g_rec_mutex_impl_new ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	270 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	271
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	272 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	273 g_rec_mutex_clear (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	274 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	275 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	276 + g_thread_win32_init ();
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 g_rec_mutex_impl_free (mutex->p);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	279 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	280
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	281 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	282 g_rec_mutex_lock (GRecMutex *mutex)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	285 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	286 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	287 EnterCriticalSection (g_rec_mutex_get_impl (mutex));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	288 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	289
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	290 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	291 g_rec_mutex_unlock (GRecMutex *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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	294 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	295 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	296 LeaveCriticalSection (mutex->p);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	297 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	298
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	299 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	300 g_rec_mutex_trylock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	301 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	302 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	303 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	304 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	305 return TryEnterCriticalSection (g_rec_mutex_get_impl (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
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	308 @@ -221,12 +265,18 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	309 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	310 g_rw_lock_init (GRWLock *lock)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	313 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	314 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	315 g_thread_impl_vtable.InitializeSRWLock (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	316 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	317
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	318 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	319 g_rw_lock_clear (GRWLock *lock)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	322 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	323 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	324 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	325 g_thread_impl_vtable.DeleteSRWLock (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	326 }
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	327 @@ -234,36 +284,54 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	328 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	329 g_rw_lock_writer_lock (GRWLock *lock)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	332 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	333 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	334 g_thread_impl_vtable.AcquireSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	335 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	336
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	337 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	338 g_rw_lock_writer_trylock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	339 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	340 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	341 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	342 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	343 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	344 }
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 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	347 g_rw_lock_writer_unlock (GRWLock *lock)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	350 + g_thread_win32_init ();
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 g_thread_impl_vtable.ReleaseSRWLockExclusive (lock);
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
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	355 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	356 g_rw_lock_reader_lock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	357 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	358 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	359 + g_thread_win32_init ();
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 g_thread_impl_vtable.AcquireSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	362 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	363
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	364 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	365 g_rw_lock_reader_trylock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	366 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	367 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	368 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	369 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	370 return g_thread_impl_vtable.TryAcquireSRWLockShared (lock);
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
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	373 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	374 g_rw_lock_reader_unlock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	375 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	376 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	377 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	378 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	379 g_thread_impl_vtable.ReleaseSRWLockShared (lock);
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
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	382 @@ -271,12 +339,18 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	383 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	384 g_cond_init (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	385 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	386 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	387 + g_thread_win32_init ();
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 g_thread_impl_vtable.InitializeConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	390 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	391
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	392 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	393 g_cond_clear (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	394 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	395 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	396 + g_thread_win32_init ();
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 if (g_thread_impl_vtable.DeleteConditionVariable)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	399 g_thread_impl_vtable.DeleteConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	400 }
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	401 @@ -284,12 +358,18 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	402 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	403 g_cond_signal (GCond *cond)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	406 + g_thread_win32_init ();
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 g_thread_impl_vtable.WakeConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	409 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	410
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	411 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	412 g_cond_broadcast (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	413 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	414 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	415 + g_thread_win32_init ();
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 g_thread_impl_vtable.WakeAllConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	418 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	419
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	420 @@ -297,6 +377,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	421 g_cond_wait (GCond *cond,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	422 GMutex *entered_mutex)
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_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	425 + g_thread_win32_init ();
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 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	428 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	429
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	430 @@ -307,6 +390,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	431 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	432 gint64 span;
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	435 + g_thread_win32_init ();
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 span = end_time - g_get_monotonic_time ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	438
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	439 if G_UNLIKELY (span < 0)
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	440 @@ -339,6 +425,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	441
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	442 if G_UNLIKELY (impl == 0)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	443 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	444 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	445 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	446 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	447 EnterCriticalSection (&g_private_lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	448 impl = (DWORD) key->p;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	449 if (impl == 0)
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	450 @@ -432,6 +521,9 @@
2618 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 GThreadWin32 wt = (GThreadWin32 ) thread;
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	455 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	456 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	457 win32_check_for_error (CloseHandle (wt->handle));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	458 g_slice_free (GThreadWin32, wt);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	459 }
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	460 @@ -439,6 +531,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	461 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	462 g_system_thread_exit (void)
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 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	465 + g_thread_win32_init ();
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 _endthreadex (0);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	468 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	469
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	470 @@ -447,6 +542,9 @@
2618 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 GThreadWin32 *self = data;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	473
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	474 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	475 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	476 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	477 self->proxy (self);
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_system_thread_exit ();
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	480 @@ -464,6 +562,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	481 GThreadWin32 *thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	482 guint ignore;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	483
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	484 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	485 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	486 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	487 thread = g_slice_new0 (GThreadWin32);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	488 thread->proxy = func;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	489
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	490 @@ -493,6 +594,9 @@
2618 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 GThreadWin32 wt = (GThreadWin32 ) thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	493
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	494 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	495 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	496 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	497 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	498 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	499
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	500 @@ -1041,6 +1145,8 @@
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	501 void
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	502 g_thread_win32_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	503 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	504 + g_threads_is_initialized = TRUE;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	505 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	506 if (!g_thread_lookup_native_funcs ())
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	507 g_thread_xp_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	508
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	509 Only in glib-2.48.1/glib: gthread-win32.c.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	510 diff -ur glib-2.48.1.orig/glib-2.0.pc.in glib-2.48.1/glib-2.0.pc.in
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	511 --- glib-2.48.1.orig/glib-2.0.pc.in 2016-12-25 13:21:25.734080512 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	512 +++ glib-2.48.1/glib-2.0.pc.in 2016-12-25 13:22:17.469289278 -0500
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	513 @@ -3,9 +3,9 @@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	514 libdir=@libdir@
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	515 includedir=@includedir@
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	516
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	517 -glib_genmarshal=glib-genmarshal
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	518 -gobject_query=gobject-query
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	519 -glib_mkenums=glib-mkenums
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	520 +glib_genmarshal=@bindir@/glib-genmarshal
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	521 +gobject_query=@bindir@/gobject-query
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	522 +glib_mkenums=@bindir@/glib-mkenums
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	523
4291 436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	524 Name: GLib
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	525 Description: C Utility Library
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	526 Only in glib-2.48.1: Makefile.am.orig
436a81e04861 glib: update to v2.48.1 John D parents: 3183 diff changeset	527 Only in glib-2.48.1: Makefile.am.rej

Mercurial > mxe-octave

annotate src/mingw-glib-1-fixes.patch @ 4291:436a81e04861