summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorChristian Ehrlicher <Ch.Ehrlicher@gmx.de>2009-11-30 10:23:54 +0100
committerunknown <Administrator@.(none)>2009-11-30 10:23:54 +0100
commit722a90c9cbc7368ffde9ad768ef4f2e45c3a620d (patch)
treea36dc33ffd570b6fb28d56bb462a18d29cf7fba0 /tools
parente73985bb144b5de819baa3f9f47a892f8ce21618 (diff)
downloaddbus-722a90c9cbc7368ffde9ad768ef4f2e45c3a620d.tar.gz
all changes for dbus-1.2 API (cherry picked from commit 6734a3210a0705e3ab01ee123fac275799877353)
Diffstat (limited to 'tools')
-rw-r--r--tools/dbus-launch-win.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c
index cc936a6c..27fabbca 100644
--- a/tools/dbus-launch-win.c
+++ b/tools/dbus-launch-win.c
@@ -68,11 +68,12 @@ int main(int argc,char **argv)
showConsole = 1;
#endif
GetModuleFileName(NULL,dbusDaemonPath,sizeof(dbusDaemonPath));
- /* check for debug version */
- if (strstr(dbusDaemonPath,"dbus-launchd.exe"))
+
+#ifdef _DEBUG
daemon_name = "dbus-daemond.exe";
- else
+#else
daemon_name = "dbus-daemon.exe";
+#endif
if ((p = strrchr(dbusDaemonPath,'\\')))
{
*(p+1)= '\0';