File glib-static.patch of Package mingw32-glib2-static-2.56.2

Overview Repositories Revisions Requests Users Attributes Meta

File glib-static.patch of Package mingw32-glib2-static-2.56.2 (Revision a6ef795e734dfa44f842f0beb383523e)

Currently displaying revision a6ef795e734dfa44f842f0beb383523e , Show latest

diff -urN glib-2.56.2.orig/glib/glib-init.c glib-2.56.2/glib/glib-init.c
--- glib-2.56.2.orig/glib/glib-init.c	2018-08-17 02:03:20.000000000 +0200
+++ glib-2.56.2/glib/glib-init.c	2019-07-09 21:13:58.842368477 +0200
@@ -275,12 +275,14 @@
 
 #if defined (G_OS_WIN32)
 
+HMODULE glib_dll = NULL;
+
+#if defined (DLL_EXPORT)
+
 BOOL WINAPI DllMain (HINSTANCE hinstDLL,
                      DWORD     fdwReason,
                      LPVOID    lpvReserved);
 
-HMODULE glib_dll;
-
 BOOL WINAPI
 DllMain (HINSTANCE hinstDLL,
          DWORD     fdwReason,
@@ -290,11 +292,6 @@
     {
     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:
@@ -318,7 +315,10 @@
   return TRUE;
 }
 
-#elif defined (G_HAS_CONSTRUCTORS)
+#endif /* defined (DLL_EXPORT) */
+#endif /* defined (G_OS_WIN32) */
+
+#if defined (G_HAS_CONSTRUCTORS)
 
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
 #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(glib_init_ctor)
@@ -328,6 +328,12 @@
 static void
 glib_init_ctor (void)
 {
+#if defined (G_OS_WIN32)
+  g_clock_win32_init ();
+#ifdef THREADS_WIN32
+  g_thread_win32_init ();
+#endif /* defined (THREADS_WIN32) */
+#endif /* defined (G_OS_WIN32) */
   glib_init ();
 }

Places

File glib-static.patch of Package mingw32-glib2-static-2.56.2 (Revision a6ef795e734dfa44f842f0beb383523e)

Places