[glib] gio/gdbusaddress: Clean up Win32 code a bit
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gio/gdbusaddress: Clean up Win32 code a bit
- Date: Thu, 12 Dec 2013 10:01:01 +0000 (UTC)
commit 3af58d2e9fefe14dc55fd41222a5c92947a08270
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Dec 12 18:00:52 2013 +0800
gio/gdbusaddress: Clean up Win32 code a bit
Combine duplicate parts into one, as the symbol used by RunDLL under x64
is the same for either Visual C++ or MinGW-64
gio/gdbusaddress.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 2e99215..ef807f6 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -1400,14 +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
-#elif defined(_WIN64)
- wcscat (args, L",g_win32_run_session_bus");
#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]