summaryrefslogtreecommitdiff
path: root/glib/glib/glib-init.c
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2014-02-03 15:41:27 -0800
committerDan Nicholson <dbn.lists@gmail.com>2014-02-03 15:41:27 -0800
commit90320817dc06052de780b406ad74db22845835ba (patch)
treeae82c1f24b63dac48c60110819da8e0707202d30 /glib/glib/glib-init.c
parente1d44d2362061a4cbd002ce059f1ac9dd78d971a (diff)
downloadpkg-config-90320817dc06052de780b406ad74db22845835ba.tar.gz
glib: Update snapshot version to 2.38.2
This is the latest stable release from upstream. Patches have been refreshed, including putting the removal of most pkg-config checks into the glib-only patch. A few more files, most notably the large NEWS file, have also been removed from the repo to keep the size of the snapshot down.
Diffstat (limited to 'glib/glib/glib-init.c')
-rw-r--r--glib/glib/glib-init.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/glib/glib/glib-init.c b/glib/glib/glib-init.c
index 3ec89a0..8f45306 100644
--- a/glib/glib/glib-init.c
+++ b/glib/glib/glib-init.c
@@ -223,6 +223,10 @@ glib_init (void)
#if defined (G_OS_WIN32)
+BOOL WINAPI DllMain (HINSTANCE hinstDLL,
+ DWORD fdwReason,
+ LPVOID lpvReserved);
+
HMODULE glib_dll;
#endif
@@ -239,12 +243,16 @@ DllMain (HINSTANCE hinstDLL,
case DLL_PROCESS_ATTACH:
glib_dll = hinstDLL;
g_clock_win32_init ();
+#ifdef THREADS_WIN32
g_thread_win32_init ();
+#endif
glib_init ();
break;
case DLL_THREAD_DETACH:
+#ifdef THREADS_WIN32
g_thread_win32_thread_detach ();
+#endif
break;
default: