[glib: 1/2] gdbus, win32: Fix accidental dllexport in static builds




commit 92c4ae1c62b52ac6a54ab63e6f0f42e111dd11dc
Author: Ole André Vadla Ravnås <oleavr gmail com>
Date:   Mon Jun 7 13:31:11 2021 +0200

    gdbus, win32: Fix accidental dllexport in static builds
    
    Should only dllexport g_win32_run_session_bus() when building a DLL.

 gio/gdbusprivate.c | 2 +-
 gio/gdbusprivate.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 282678f3b..7e62fa89e 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -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;
diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h
index 8f8a93ba7..72d2c32a9 100644
--- a/gio/gdbusprivate.h
+++ b/gio/gdbusprivate.h
@@ -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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]