diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2011-12-25 14:34:59 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2011-12-25 14:34:59 +0100 |
| commit | b8ce35180653696187ee086e624e57505329eb97 (patch) | |
| tree | 1c0162dc98dd431609c42447cc06537b572d74a0 | |
| parent | e15ebf32a97b4fb5bd9ca293b4f24866413cb8bf (diff) | |
| parent | 5ec835dac93a084ff5f697a9b83b640689462e00 (diff) | |
Merge branch 'dbus-1.4'
Conflicts:
dbus/dbus-spawn-win.c
| -rw-r--r-- | dbus/dbus-spawn-win.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c index a7416cb6..cb6ebb2d 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -42,6 +42,7 @@ #include "dbus-protocol.h" #define WIN32_LEAN_AND_MEAN +#include <windows.h> //#define STRICT //#include <windows.h> //#undef STRICT @@ -563,10 +564,10 @@ spawn_program (char* name, char** argv, char** envp) // handle relative pathes if (strlen(name) > 2 && name[0] != '\\' && name[0] != '/' && name[1] != ':') { - _dbus_verbose ("babysitter: spawning %s", name); char install_root[2*MAX_PATH]; LPSTR lpFile; char *p; + _dbus_verbose ("babysitter: spawning %s", name); if (!_dbus_get_install_root (install_root, sizeof(install_root))) return INVALID_HANDLE_VALUE; |