apply remaining unapplied parts of eeedba5b2f5b008819619764943caddd52441adf in dbus4win

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 1e83d80..35f3e1f 100644 (file)
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -90,7 +90,8 @@ if(MSVC)
    SET(DBUS_VA_COPY_FUNC "_DBUS_VA_COPY_ASSIGN";)
 else(MSVC)
 write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include <stdarg.h>
-       void f (int i, ...) {
+       #include <stdlib.h>
+        static void f (int i, ...) {
        va_list args1, args2;
        va_start (args1, i);
        va_copy (args2, args1);
@@ -111,7 +112,8 @@ if(DBUS_HAVE_VA_COPY)
   SET(DBUS_VA_COPY_FUNC va_copy CACHE STRING "va_copy function")
 else(DBUS_HAVE_VA_COPY)
   write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include <stdarg.h>
-         void f (int i, ...) {
+          #include <stdlib.h>
+         static void f (int i, ...) {
          va_list args1, args2;
          va_start (args1, i);
          __va_copy (args2, args1);

diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index e31d0f8..688ec19 100644 (file)
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -1020,7 +1020,7 @@ _dbus_string_get_dirname  (const DBusString *filename,
 static void
 string_squash_nonprintable (DBusString *str)
 {
-  char *buf;
+  unsigned char *buf;
   int i, len; 
   
   buf = _dbus_string_get_data (str);

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 1f4c3a2..c27f999 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -49,6 +49,9 @@ _DBUS_DEFINE_GLOBAL_LOCK (system_users);
 
 #ifdef DBUS_WIN
   #include <stdlib.h>
+#elif (defined __APPLE__)
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
 #else
 extern char **environ;
 #endif