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
#include <string.h>
+#include <gio/gnetworking.h>
+
#include "soup-address.h"
#include "soup.h"
#include "soup-marshal.h"
#include <sys/types.h>
-#include <libsoup/soup-portability.h>
#include <libsoup/soup-types.h>
G_BEGIN_DECLS
#define SOUP_ADDRESS_ANY_PORT 0
+struct sockaddr;
+
typedef void (*SoupAddressCallback) (SoupAddress *addr,
guint status,
gpointer user_data);
#include <string.h>
+#include <gio/gnetworking.h>
+
#include "soup-socket.h"
#include "soup.h"
#include "soup-filter-input-stream.h"
#include "test-utils.h"
+#include <gio/gnetworking.h>
+
SoupServer *server;
SoupURI *base_uri;
GMutex server_mutex;
* 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)
{