fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-23 02:30:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mingw compile++ , w2k-support++

Browse source 
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
This commit is contained in:
Christian Ehrlicher 2008-05-09 16:17:13 +00:00 • committed by unknown
parent 8770f444fd
commit 452ff68a2d
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/ConfigureChecks.cmake
View file

@ -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/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(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(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(unistd.h HAVE_UNISTD_H) # dbus-sysdeps-util-win.c
check_include_file(stdio.h HAVE_STDIO_H) # dbus-sysdeps.h 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 check_include_file(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) # dbus-sysdeps-unix.c

3
cmake/config.h.cmake
View file

@ -82,6 +82,9 @@
/* Define to 1 if you have time.h */ /* Define to 1 if you have time.h */
#cmakedefine HAVE_TIME_H 1 #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 */ /* Define to 1 if you have unistd.h */
#cmakedefine HAVE_UNISTD_H 1 #cmakedefine HAVE_UNISTD_H 1

2
configure.in
View file

@ -443,6 +443,8 @@ AC_CHECK_HEADERS(byteswap.h)
AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(unistd.h)
AC_CHECK_HEADERS(wspiapi.h)
# Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
# #
case $host_os in case $host_os in

10
dbus/dbus-sysdeps-win.c
View file

@ -53,6 +53,16 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.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 #ifndef O_BINARY
#define O_BINARY 0 #define O_BINARY 0
#endif #endif