[glib/glib-2-38] gio/gdbusaddress.c: Fix RunDLL call for Windows/x64 builds
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-38] gio/gdbusaddress.c: Fix RunDLL call for Windows/x64 builds
- Date: Thu, 12 Dec 2013 10:06:38 +0000 (UTC)
commit e17ecc421b052c8e722d3e73e82fe3a06f02b9d0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Dec 12 18:06:29 2013 +0800
gio/gdbusaddress.c: Fix RunDLL call for Windows/x64 builds
On x64 builds under both Visual C++ and MinGW-64, the correct symbol for
the RunDLL call is g_win32_run_session_bus, so this will silence the
annoying RunDLL error for x64 MinGW builds as well, and will allow this
call to be executed more than once.
Thanks to Tarnyko for pointing this out.
gio/gdbusaddress.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index b5143cf..ef807f6 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -1400,12 +1400,10 @@ get_session_address_dbus_launch (GError **error)
wcscat (args, rundll_path);
wcscat (args, L"\" ");
wcscat (args, gio_path_short);
-#ifdef _MSC_VER
#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
wcscat (args, L",g_win32_run_session_bus");
-#else
+#elif defined (_MSC_VER)
wcscat (args, L",_g_win32_run_session_bus 16");
-#endif
#else
wcscat (args, L",g_win32_run_session_bus 16");
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]