projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7c1ad4
)
gio/gdbusaddress: Clean up Win32 code a bit
author
Chun-wei Fan
<fanchunwei@src.gnome.org>
Thu, 12 Dec 2013 10:00:52 +0000
(18:00 +0800)
committer
Chun-wei Fan
<fanchunwei@src.gnome.org>
Thu, 12 Dec 2013 10:00:52 +0000
(18:00 +0800)
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
patch
|
blob
|
history
diff --git
a/gio/gdbusaddress.c
b/gio/gdbusaddress.c
index
2e99215
..
ef807f6
100644
(file)
--- 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");
-#el
se
+#el
if 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