diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2007-03-09 Ralf Habacker <ralf.habacker@freenet.de> + + * cmake/config.h.cmake: fixed DBUS_WINxx defines, + using _WINCE does not work. + 2007-03-08 Ralf Habacker <ralf.habacker@freenet.de> * dbus-win.patch: removed _dbus_write_pipe() patch, it is now diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index b90005e8..7d1808de 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -118,12 +118,12 @@ #cmakedefine HAVE_CMSGCRED 1 // system type defines -#if defined(_WIN32) || defined(_WIN64) || defined(_WINCE) +#if defined(_WIN32) || defined(_WIN64) # define DBUS_WIN # define DBUS_WIN_FIXME 1 #endif -#if defined(_WIN32) +defined(_WIN32) && !defined(_WIN32_WCE) # define DBUS_WIN32 #endif @@ -131,7 +131,7 @@ # define DBUS_WIN64 #endif -#if defined(_WINCE) +#if defined(_WIN32_WCE) # define DBUS_WINCE #endif @@ -154,7 +154,6 @@ # endif #endif // defined(_WIN32) || defined(_WIN64) - #ifdef interface #undef interface #endif |