From 9b00583aabca2c7200189c8e40f34dda819c3e80 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Fri, 19 Apr 2013 09:57:34 -0400
Subject: Fix build on Windows, deprecate soup-portability.h

soup-portability.h created portability problems (ha!) because the
windows headers do "#define interface struct", conflicting with
variable names elsewhere.

The only thing that needed soup-portability.h in the public headers
was soup-address.h, which uses struct sockaddr. But we can just do a
forward declaration of that type rather than actually pulling in the
headers. Then soup-address.h can stop including soup-portability.h,
and we can use gio/gnetworking.h in the handful of other places that
need networking-related includes.

This may possibly break some other modules that depended on implicitly
getting network includes as a side effect of including soup.h...

https://bugzilla.gnome.org/show_bug.cgi?id=692134
---
 libsoup/soup-address.c  | 2 ++
 libsoup/soup-address.h  | 3 ++-
 libsoup/soup-socket.c   | 2 ++
 tests/connection-test.c | 2 ++
 tests/socket-test.c     | 6 ++----
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libsoup/soup-address.c b/libsoup/soup-address.c
index 286be8c7..da4da948 100644
--- a/libsoup/soup-address.c
+++ b/libsoup/soup-address.c
@@ -11,6 +11,8 @@
 
 #include <string.h>
 
+#include <gio/gnetworking.h>
+
 #include "soup-address.h"
 #include "soup.h"
 #include "soup-marshal.h"
diff --git a/libsoup/soup-address.h b/libsoup/soup-address.h
index dd4c275d..797a5506 100644
--- a/libsoup/soup-address.h
+++ b/libsoup/soup-address.h
@@ -8,7 +8,6 @@
 
 #include <sys/types.h>
 
-#include <libsoup/soup-portability.h>
 #include <libsoup/soup-types.h>
 
 G_BEGIN_DECLS
@@ -51,6 +50,8 @@ typedef enum {
 
 #define SOUP_ADDRESS_ANY_PORT 0
 
+struct sockaddr;
+
 typedef void   (*SoupAddressCallback)            (SoupAddress         *addr,
 						  guint                status,
 						  gpointer             user_data);
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index 4268429b..9e4de132 100644
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -11,6 +11,8 @@
 
 #include <string.h>
 
+#include <gio/gnetworking.h>
+
 #include "soup-socket.h"
 #include "soup.h"
 #include "soup-filter-input-stream.h"
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 1a8c51a4..cdc4cced 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -5,6 +5,8 @@
 
 #include "test-utils.h"
 
+#include <gio/gnetworking.h>
+
 SoupServer *server;
 SoupURI *base_uri;
 GMutex server_mutex;
diff --git a/tests/socket-test.c b/tests/socket-test.c
index 60c3e86c..42ab6c8b 100644
--- a/tests/socket-test.c
+++ b/tests/socket-test.c
@@ -4,12 +4,10 @@
  * Copyright 2012 Nokia Corporation
  */
 
-#include <libsoup/soup.h>
-
-#include <string.h>
-
 #include "test-utils.h"
 
+#include <gio/gnetworking.h>
+
 static void
 do_unconnected_socket_test (void)
 {
-- 
cgit v1.2.3