diff options
| author | Romain Pokrzywka <romain@kdab.com> | 2010-02-03 12:27:47 -0800 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-02-07 00:32:46 +0100 |
| commit | 1cd84d825889fd5cc5cfcbddc12bce1ef928f8a7 (patch) | |
| tree | 2f02b9e07fd1b79719401e0bc52f4014b54e71c2 /tools | |
| parent | 196b310dd1e67444e16b12f904f1c1d8e7b988ae (diff) | |
| download | dbus-1cd84d825889fd5cc5cfcbddc12bce1ef928f8a7.tar.gz | |
remove DBUS_DAEMON_EXECUTABLE_NAME, we already have DBUS_DAEMON_NAME, and use the specified name for the executable when building with cmake
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dbus-launch-win.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c index 352a28d8..140238e9 100644 --- a/tools/dbus-launch-win.c +++ b/tools/dbus-launch-win.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#include <config.h> #include <windows.h> #include <stdio.h> #include <string.h> @@ -90,12 +91,9 @@ int main(int argc,char **argv) showConsole = 1; #endif GetModuleFileName(NULL,dbusDaemonPath,sizeof(dbusDaemonPath)); - -#ifdef _DEBUG - daemon_name = "dbus-daemond.exe"; -#else - daemon_name = "dbus-daemon.exe"; -#endif + + daemon_name = DBUS_DAEMON_NAME ".exe"; + if ((p = _mbsrchr (dbusDaemonPath, '\\'))) { *(p+1)= '\0'; @@ -134,7 +132,7 @@ int main(int argc,char **argv) if (result == 0) { if (verbose) - fprintf(stderr, "Could not start dbus-daemon error=%d",GetLastError()); + fprintf(stderr, "Could not start " DBUS_DAEMON_NAME ". error=%d",GetLastError()); return 4; } |