Attachment 85240 Details for Bug 68852 – dbus-sysdeps-win: don't include wspiapi.h

[patch] dbus-sysdeps-win: don't include wspiapi.h

0001-dbus-sysdeps-win-don-t-include-wspiapi.h.patch (text/plain), 3.26 KB, created by Simon McVittie on 2013-09-05 11:48:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-05 11:48:39 UTC

Size: 3.26 KB

patch

obsolete

>From 94a3cbe6bf490e0349b4785c45f76de464b01a84 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 2 Sep 2013 17:39:37 +0100
>Subject: [PATCH] dbus-sysdeps-win: don't include wspiapi.h
>
>This block provoked a warning on mingw-w64 because we were redefining
>_inline. According to Ralf's research, it was introduced in 452ff68a:
>Windows 2000 doesn't have getaddrinfo and related functions in
>ws2tcpip.h, but does have a shim implementation in wspiapi.h.
>
>At the time of 452ff68a, mingw32 didn't have wspiapi.h, so it's unclear
>why there was a __GNUC__ code path here. The "#define _inline" on that
>code path looks likely to be some sort of workaround for a faulty version
>of wspiapi.h? Current mingw-w64 does have wspiapi.h, so we enter the
>__GNUC__ code path and get the redefinition.
>
>dbus no longer supports Windows 2000, so we no longer need wspiapi.h
>at all, and can rely on XP or later. (Ralf's policy is to only support
>versions of Windows that are still supported by Microsoft, and Windows 2000
>reached the end of its life-cycle in 2010.)
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
>---
> cmake/ConfigureChecks.cmake |  1 -
> cmake/config.h.cmake        |  3 ---
> configure.ac                |  2 --
> dbus/dbus-sysdeps-win.c     | 10 ----------
> 4 files changed, 16 deletions(-)
>
>diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
>index 33a9cee..4770472 100644
>--- a/cmake/ConfigureChecks.cmake
>+++ b/cmake/ConfigureChecks.cmake
>@@ -11,7 +11,6 @@ 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
> 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 f14b169..d6ea64f 100644
>--- a/cmake/config.h.cmake
>+++ b/cmake/config.h.cmake
>@@ -124,9 +124,6 @@
> /* 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
>-
> /* Define to 1 if you have unistd.h */
> #cmakedefine   HAVE_UNISTD_H 1
> 
>diff --git a/configure.ac b/configure.ac
>index ab7b1e1..3766e9d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -704,8 +704,6 @@ AC_CHECK_HEADERS(unistd.h)
> 
> AC_CHECK_HEADERS(ws2tcpip.h)
> 
>-AC_CHECK_HEADERS(wspiapi.h)
>-
> AC_CHECK_HEADERS(alloca.h)
> 
> # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index a77e5b5..1c974c5 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -77,16 +77,6 @@ extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
> #include <ws2tcpip.h>
> #endif
> 
>-#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
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68852: 85071 | 85072 | 85073 | 85074 | 85076 | 85077 | 85082 | 85109 | 85110 | 85240 | 85604

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.