luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 05:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for <wspiapi.h> and use it if present

Browse Source 
Should help bug #603527 if glib is built in an environment that has
<wspiapi.h>.
This commit is contained in:
Tor Lillqvist 2009-12-14 03:09:46 +02:00
parent cdf00a6a9b
commit 8dc200db04
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.h.win32.in
View File

@ -607,6 +607,13 @@
/* Have a working bcopy */ /* Have a working bcopy */
/* #undef HAVE_WORKING_BCOPY */ /* #undef HAVE_WORKING_BCOPY */
/* Define to 1 if you have the <wspiapi.h> header file. */
#ifndef _MSC_VER
/* #undef HAVE_WSPIAPI_H */
#else
#define HAVE_WSPIAPI_H 1
#endif
/* Define to 1 if xattr is available */ /* Define to 1 if xattr is available */
/* #undef HAVE_XATTR */ /* #undef HAVE_XATTR */

2
configure.in
View File

@ -1006,7 +1006,7 @@ if $glib_failed ; then
fi fi
AC_CHECK_FUNCS(getprotobyname_r endservent) AC_CHECK_FUNCS(getprotobyname_r endservent)
AC_CHECK_HEADERS([netdb.h winsock2.h mswsock.h]) AC_CHECK_HEADERS([netdb.h winsock2.h mswsock.h wspiapi.h])
# For gio/libasyncns # For gio/libasyncns
if test $glib_native_win32 = no; then if test $glib_native_win32 = no; then

8
gio/gwin32resolver.c
View File

@ -34,6 +34,14 @@
#include "gsimpleasyncresult.h" #include "gsimpleasyncresult.h"
#include "gsocketaddress.h" #include "gsocketaddress.h"
#ifdef HAVE_WSPIAPI_H
/* <wspiapi.h> in the Windows SDK and in mingw-w64 has wrappers for
* inline workarounds for getaddrinfo, getnameinfo and freeaddrinfo if
* they aren't present at run-time (on Windows 2000).
*/
#include <wspiapi.h>
#endif
#include "gioalias.h" #include "gioalias.h"
G_DEFINE_TYPE (GWin32Resolver, g_win32_resolver, G_TYPE_THREADED_RESOLVER) G_DEFINE_TYPE (GWin32Resolver, g_win32_resolver, G_TYPE_THREADED_RESOLVER)