Merge branch 'fix_dllMain_win32' into 'gtk-3-24'

Fix dllMain win32

See merge request GNOME/gtk!4524
This commit is contained in:
Luca Bacci 2022-03-01 06:03:37 +00:00
commit a17a0c5452
2 changed files with 4 additions and 0 deletions

View File

@ -49,6 +49,7 @@
static gboolean gdk_synchronize = FALSE; static gboolean gdk_synchronize = FALSE;
#ifdef DLL_EXPORT
BOOL WINAPI BOOL WINAPI
DllMain (HINSTANCE hinstDLL, DllMain (HINSTANCE hinstDLL,
DWORD dwReason, DWORD dwReason,
@ -58,6 +59,7 @@ DllMain (HINSTANCE hinstDLL,
return TRUE; return TRUE;
} }
#endif
void void
_gdk_win32_windowing_init (void) _gdk_win32_windowing_init (void)

View File

@ -41,6 +41,7 @@
static HMODULE gtk_dll; static HMODULE gtk_dll;
#ifdef DLL_EXPORT
BOOL WINAPI BOOL WINAPI
DllMain (HINSTANCE hinstDLL, DllMain (HINSTANCE hinstDLL,
DWORD fdwReason, DWORD fdwReason,
@ -55,6 +56,7 @@ DllMain (HINSTANCE hinstDLL,
return TRUE; return TRUE;
} }
#endif
static BOOL CALLBACK static BOOL CALLBACK
find_first_manifest (HMODULE module_handle, find_first_manifest (HMODULE module_handle,