dbus/cmake config.h.cmake,1.2,1.3

Ralf Habacker rhabacker at kemper.freedesktop.org
Fri Mar 9 11:23:47 PST 2007


Update of /cvs/dbus/dbus/cmake
In directory kemper:/tmp/cvs-serv30438/cmake

Modified Files:
	config.h.cmake 
Log Message:
* cmake/config.h.cmake: fixed DBUS_WINxx defines, using _WINCE does not work.

Index: config.h.cmake
===================================================================
RCS file: /cvs/dbus/dbus/cmake/config.h.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.h.cmake	8 Mar 2007 20:10:09 -0000	1.2
+++ config.h.cmake	9 Mar 2007 19:23:45 -0000	1.3
@@ -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



More information about the dbus-commit mailing list