* cmake/CMakeLists.txt: use local include header first

* dbus/dbus-sysdeps-win.c: mingw compile fix of DBusCredential struct

diff --git a/ChangeLog b/ChangeLog
index e89abd6c5a4b52c8bb79c21102678db80f730cff..0450aaaa044b56b5f9d868d3175bdbbd382abacf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2007-06-15  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * cmake/CMakeLists.txt: use local include header first
+
+       * dbus/dbus-sysdeps-win.c: mingw fix of DBusCredential struct
+
+2007-06-15  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * cmake/ConfigureChecks.cmake,cmake/config.h.cmake: 
+       added check for HAVE_ERRNO_H
+
+       * cmake/dbus/CMakeLists.txt: added missing files 
+       
+       * dbus/dbus-transport-win.c/.h: new files
+
+       * dbus/dbus-sysdeps-win.c,.h: added required _unix functions 
+       to make dbus compilable on win32 
+       
+       * dbus/dbus-sysdeps-win-utils.c,.h: moved some functions to 
+       dbus-sysdeps-win.c
+       
+       * dbus-win.patch: removed applied or obsolate patches
+       
+       Note: dbus-win32 is now compilable, no guarantee that it runs 
+       without any problems 
+
 2007-06-15  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-sysdeps-unix.c (_dbus_append_session_config_file)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 3728aba0a9ef798938a1201835d05044ce2434e4..ab472be0da4de34e93c3830fa378e289ffd36b5b 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -20,7 +20,9 @@ endif (CYGWIN)
     
 # search for required packages
 if (WIN32)
-       find_package(KDEWIN)
+    # include local header first to avoid using old installed header
+    set (CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/..)
+    find_package(KDEWIN)
     find_package(KDEWIN_Packager)
        find_package(LibIconv)
     include(Win32Macros)
@@ -87,6 +89,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    set (CMAKE_DEBUG_POSTFIX "d")
 endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -save-temps")
+message(STATUS "-----" ${CMAKE_INCLUDE_PATH})
 
 #########################################################################
 # Windows CE

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index f938bda8828335824144cc32a636c47cff18c0cd..80a179382282dd6b4881180e4ab4b53e560fb956 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -28,11 +28,11 @@
 
 /* #define ENABLE_DBUSUSERINFO */
 
-typedef struct DBusCredentials{
+struct DBusCredentials{
     int uid;
     int gid;
     int pid;
-} DBusCredentials;
+};
 
 #undef open