[glib] GResolver: fix Windows 2000 workaround
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] GResolver: fix Windows 2000 workaround
- Date: Wed, 3 Mar 2010 14:53:42 +0000 (UTC)
commit 9a886135c80233a5a40071189df7693151201954
Author: Dan Winship <danw gnome org>
Date: Wed Mar 3 08:35:32 2010 -0500
GResolver: fix Windows 2000 workaround
Move the <wspiapi.h> include from gwin32resolver.c to
gnetworkingprivate.h, since gthreadedresolver.c needs it too.
https://bugzilla.gnome.org/show_bug.cgi?id=611696
gio/gnetworkingprivate.h | 8 ++++++++
gio/gwin32resolver.c | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h
index 56b800b..4477032 100644
--- a/gio/gnetworkingprivate.h
+++ b/gio/gnetworkingprivate.h
@@ -30,6 +30,14 @@
#include <windns.h>
#include <mswsock.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
+
#else /* !G_OS_WIN32 */
#include <sys/types.h>
diff --git a/gio/gwin32resolver.c b/gio/gwin32resolver.c
index 13cb45e..5198b95 100644
--- a/gio/gwin32resolver.c
+++ b/gio/gwin32resolver.c
@@ -34,14 +34,6 @@
#include "gsimpleasyncresult.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"
G_DEFINE_TYPE (GWin32Resolver, g_win32_resolver, G_TYPE_THREADED_RESOLVER)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]