* cmake/CMakeList.txt,cmake/config.h.cmake: used DBUS_WIN for all win32 systems and...

diff --git a/ChangeLog b/ChangeLog
index 571492f..2d8d91e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
 
+       * cmake/CMakeList.txt,cmake/config.h.cmake: used 
+       DBUS_WIN for all win32 systems and DBUS_WINXX for 
+       specific subsystems.
+
+2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
+
        * dbus-win.patch: updated patch for bus/dispatch.c.
 
 2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index c2dbf06..9eb65b2 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -93,7 +93,8 @@ if(wince)
        include_directories(${wcelibcex}/include/wcelibcex ${wcelibcex}/src)
        
        add_definitions(
-                       -DDBUS_WINCE
+# see config.h.cmake
+#                      -DDBUS_WINCE
                        -DWINCE
                        -DWIN32_PLATFORM_PSPC
                        -D_WINDOWS

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 7faffef..b90005e 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -117,9 +117,25 @@
 /* Define to 1 if you have struct cmsgred */
 #cmakedefine    HAVE_CMSGCRED 1
 
-#if defined(_WIN32) || defined(_WIN64)
+// system type defines
+#if defined(_WIN32) || defined(_WIN64) || defined(_WINCE)
 # define DBUS_WIN
 # define DBUS_WIN_FIXME 1
+#endif
+
+#if defined(_WIN32)
+# define DBUS_WIN32
+#endif
+
+#if defined(_WIN64)
+# define DBUS_WIN64
+#endif
+
+#if defined(_WINCE)
+# define DBUS_WINCE
+#endif
+
+#if defined(_WIN32) || defined(_WIN64)
 // mingw mode_t
 # ifdef HAVE_STDIO_H
 #  include <stdio.h>
@@ -138,6 +154,7 @@
 # endif
 #endif // defined(_WIN32) || defined(_WIN64)
 
+
 #ifdef interface
 #undef interface
 #endif