Merge branch 'fix/accidental-dllexport' into 'main'

gdbus, win32: Fix accidental dllexport in static builds

See merge request GNOME/glib!2139
This commit is contained in:
Philip Withnall 2021-06-07 14:54:46 +00:00
commit 2b4e8521e8
2 changed files with 2 additions and 2 deletions

View File

@ -2292,7 +2292,7 @@ turn_off_the_starting_cursor (void)
}
}
__declspec(dllexport) void __stdcall
void __stdcall
g_win32_run_session_bus (void* hwnd, void* hinst, const char* cmdline, int cmdshow)
{
GDBusDaemon *daemon;

View File

@ -117,7 +117,7 @@ gchar *_g_dbus_win32_get_user_sid (void);
* Initially this function was introduces for usage with rundll,
* so the signature is kept rundll-compatible, though parameters aren't used.
*/
__declspec(dllexport) void __stdcall
_GLIB_EXTERN void __stdcall
g_win32_run_session_bus (void* hwnd, void* hinst, const char* cmdline, int cmdshow);
gchar *_g_dbus_win32_get_session_address_dbus_launch (GError **error);
#endif