diff options
| author | Christian Ehrlicher <Ch.Ehrlicher@gmx.de> | 2008-05-09 16:17:13 +0000 |
|---|---|---|
| committer | unknown <Administrator@.(none)> | 2009-11-29 19:06:22 +0100 |
| commit | 452ff68a2d81beb55c43713bc226a51b7c3d38a7 (patch) | |
| tree | eb85cadaa50d877ddf7c36ddd70f33e1b56bebcf | |
| parent | 8770f444fd0ad6ae56d4a600b0eccc118374960e (diff) | |
mingw compile++ , w2k-support++
dbus/dbus-sysdeps-win.c: Don't unconditionally #include <wspiapi.h>
* cmake/ConfigureChecks.cmake, cmake/config.h.cmake, configure.in:
check for wspiapi.h presence which isn't available (and unneeded) in mingw32
* dbus/dbus-sysdeps-win.c: use HAVE_WSPIAPI_H
| -rw-r--r-- | cmake/ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-win.c | 10 |
4 files changed, 16 insertions, 0 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 1212bf9f..756d67fe 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(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 check_include_file(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) # dbus-sysdeps-unix.c diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 018fdfd2..4f523878 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -82,6 +82,9 @@ /* Define to 1 if you have time.h */ #cmakedefine HAVE_TIME_H 1 +/* Define to 1 if you have wspiapi.h */ +#cmakedefine HAVE_WSPIAPI_H 1 + /* Define to 1 if you have unistd.h */ #cmakedefine HAVE_UNISTD_H 1 diff --git a/configure.in b/configure.in index 34c79a56..24ad5544 100644 --- a/configure.in +++ b/configure.in @@ -443,6 +443,8 @@ AC_CHECK_HEADERS(byteswap.h) AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(wspiapi.h) + # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris # case $host_os in diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 4a42c761..98bf4c94 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -53,6 +53,16 @@ #include <sys/stat.h> #include <sys/types.h> +#ifdef HAVE_WSPIAPI_H +// needed for w2k compatibility (getaddrinfo/freeaddrinfo/getnameinfo) +#ifdef __GNUC__ +#define _inline +#include "wspiapi.h" +#else +#include <wspiapi.h> +#endif +#endif // HAVE_WSPIAPI_H + #ifndef O_BINARY #define O_BINARY 0 #endif |