Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

NEWS

@@ -1,6 +1,12 @@
 D-Bus 1.7.0 (UNRELEASED)
 ==
 
+• Unix-specific:
+  · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin)
+
+D-Bus 1.6.4 (2012-07-18)
+==
+
 Enhancements:
 
 • D-Bus Specification 0.20
@@ -19,6 +25,10 @@ Fixes:
 • Make --enable-developer default to "no" (regression in 1.6.2;
   fd.o #51657, Simon McVittie)
 
+• Windows-specific:
+  · Launch dbus-daemon correctly if its path contains a space
+    (fd.o #49450, Wolfgang Baron)
+
 D-Bus 1.6.2 (2012-06-27)
 ==
 

configure.ac

@@ -1379,6 +1379,8 @@ case $host_os in
     solaris*)
         # Solaris' C library apparently needs these runes to be threadsafe...
         CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
+        # ... this opt-in to get sockaddr_in6 and sockaddr_storage...
+        CFLAGS="$CFLAGS -D__EXTENSIONS__"
         # ... and this opt-in to get file descriptor passing support
         CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
         ;;

dbus/dbus-sysdeps-util-unix.c

@@ -424,7 +424,7 @@ _dbus_request_file_descriptor_limit (unsigned int limit)
 void
 _dbus_init_system_log (void)
 {
-#ifdef HAVE_DECL_LOG_PERROR
+#if HAVE_DECL_LOG_PERROR
   openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
 #else
   openlog ("dbus", LOG_PID, LOG_DAEMON);

tools/dbus-launch-win.c

@@ -130,9 +130,10 @@ main (int argc, char **argv)
      fprintf (stderr, "%ls %ls\n", dbusDaemonPath, command);
 #else
    command[0] = L'\0';
-   /* Windows CE has a different interpretation of cmdline: Start with argv[1].  */
-   wcscpy_s (command, sizeof (command), dbusDaemonPath);
-   wcscat_s (command, sizeof (command), L" --session");
+   /* Windows cmdline starts with path, which can contain spaces.  */
+   wcscpy_s (command, sizeof (command), L"\"");
+   wcscat_s (command, sizeof (command), dbusDaemonPath);
+   wcscat_s (command, sizeof (command), L"\" --session");
    if (verbose)
      fprintf (stderr, "%ls\n", command);
 #endif