From: Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Date: Wed, 14 Apr 2010 01:20:44 +0000 (+0200)
Subject: Fix warnings on Windows CE target.
X-Git-Tag: dbus-1.3.1~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abb81eb446f74388ba115c2cf3cd4ef2b72d99f0;p=thirdparty%2Fdbus.git

Fix warnings on Windows CE target.
---

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 5c405a87f..4b9fbd154 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -10,6 +10,7 @@ check_include_file(sys/poll.h   HAVE_POLL)      # dbus-sysdeps.c, dbus-sysdeps-w
 check_include_file(sys/time.h   HAVE_SYS_TIME_H)# dbus-sysdeps-win.c
 check_include_file(sys/wait.h   HAVE_SYS_WAIT_H)# dbus-sysdeps-win.c
 check_include_file(time.h       HAVE_TIME_H)    # dbus-sysdeps-win.c
+check_include_file(ws2tcpip.h   HAVE_WS2TCPIP_H)# dbus-sysdeps-win.c
 check_include_file(wspiapi.h    HAVE_WSPIAPI_H) # dbus-sysdeps-win.c
 check_include_file(unistd.h     HAVE_UNISTD_H)  # dbus-sysdeps-util-win.c
 check_include_file(stdio.h      HAVE_STDIO_H)   # dbus-sysdeps.h
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 9083eb4b7..072dbdf4e 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -119,6 +119,9 @@
 /* Define to 1 if you have time.h */
 #cmakedefine   HAVE_TIME_H 1
 
+/* Define to 1 if you have ws2tcpip.h */
+#cmakedefine   HAVE_WS2TCPIP_H
+
 /* Define to 1 if you have wspiapi.h */
 #cmakedefine   HAVE_WSPIAPI_H 1
 
diff --git a/configure.in b/configure.in
index 83ef91dcd..74f6f5e75 100644
--- a/configure.in
+++ b/configure.in
@@ -532,6 +532,8 @@ AC_CHECK_HEADERS(byteswap.h)
 
 AC_CHECK_HEADERS(unistd.h)
 
+AC_CHECK_HEADERS(ws2tcpip.h)
+
 AC_CHECK_HEADERS(wspiapi.h)
 
 # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index bcb9c824f..16c6f696f 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -69,6 +69,11 @@ extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
 #include <sys/types.h>
 #endif
 
+#ifdef HAVE_WS2TCPIP_H
+/* getaddrinfo for Windows CE (and Windows).  */
+#include <ws2tcpip.h>
+#endif
+
 #ifdef HAVE_WSPIAPI_H
 // needed for w2k compatibility (getaddrinfo/freeaddrinfo/getnameinfo)
 #ifdef __GNUC__
diff --git a/dbus/dbus-sysdeps-wince-glue.h b/dbus/dbus-sysdeps-wince-glue.h
index 47f13da0d..6d8e3b1e8 100644
--- a/dbus/dbus-sysdeps-wince-glue.h
+++ b/dbus/dbus-sysdeps-wince-glue.h
@@ -28,6 +28,8 @@
 #include <time.h>
 #include <stdarg.h>
 
+/* For getaddrinfo.  */
+#define _WIN32_WCE 0x0401 
 #include <windows.h>
 #undef interface
 
@@ -46,7 +48,7 @@ BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPWSTR,int,BOOL);
 
 /* Seriously.  Windows CE does not have errno.  Don't you hate it when
    that happens?  */
-#define errno (GetLastError ())
+#define errno ((int)GetLastError ())
 
 #define ENOENT          ERROR_FILE_NOT_FOUND
 #define EMFILE          ERROR_TOO_MANY_OPEN_FILES