diff options
| author | Dan Winship <danw@gnome.org> | 2013-04-19 09:57:34 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-04-19 09:57:34 -0400 |
| commit | 9b00583aabca2c7200189c8e40f34dda819c3e80 (patch) | |
| tree | 14529ca6d4a48e79b7496f21c588fa6d51afc873 /tests/socket-test.c | |
| parent | ce2043a7a81d2d8c9fba3b87a03df52df99e4115 (diff) | |
| download | libsoup-9b00583aabca2c7200189c8e40f34dda819c3e80.tar.gz libsoup-9b00583aabca2c7200189c8e40f34dda819c3e80.tar.bz2 libsoup-9b00583aabca2c7200189c8e40f34dda819c3e80.zip | |
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
Diffstat (limited to 'tests/socket-test.c')
| -rw-r--r-- | tests/socket-test.c | 6 |
1 files changed, 2 insertions, 4 deletions
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) { |