Merge remote branch 'gvdb/master'

[platform/upstream/glib.git] / gio / gwin32resolver.c

diff --git a/gio/gwin32resolver.c b/gio/gwin32resolver.c
index 13cb45e..1dd2aad 100644 (file)
--- a/gio/gwin32resolver.c
+++ b/gio/gwin32resolver.c
@@ -34,15 +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)
 
@@ -490,6 +481,3 @@ g_win32_handle_source_add (HANDLE      handle,
   g_source_attach (source, g_main_context_get_thread_default ());
   return source;
 }
-
-#define __G_WIN32_RESOLVER_C__
-#include "gioaliasdef.c"