diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2022-01-06 13:30:14 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2022-01-06 13:30:14 +0000 |
| commit | dc07a482f938d15187d2745581db45a46b8fd5b1 (patch) | |
| tree | c537ea92e748aaf1e062699819e9b9c93679fb89 | |
| parent | 263d946dbd8fb85ca3274b94705c053b65d199b8 (diff) | |
| parent | b226e530206f55f860d2bbc15895aac081f2d924 (diff) | |
| download | libgdata-dc07a482f938d15187d2745581db45a46b8fd5b1.tar.gz | |
Merge branch 'fix-win32' into 'main'
Fix build for win32 platform
See merge request GNOME/libgdata!44
| -rw-r--r-- | gdata/tests/streams.c | 4 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gdata/tests/streams.c b/gdata/tests/streams.c index 7158754f..6ba5f960 100644 --- a/gdata/tests/streams.c +++ b/gdata/tests/streams.c @@ -22,10 +22,12 @@ #include <glib.h> #include <locale.h> #include <string.h> -#include <arpa/inet.h> #include <sys/types.h> +#ifndef G_OS_WIN32 +#include <arpa/inet.h> #include <netinet/in.h> #include <sys/socket.h> +#endif #include "gdata.h" #include "common.h" diff --git a/meson.build b/meson.build index 5021f380..68eb0b1a 100644 --- a/meson.build +++ b/meson.build @@ -78,7 +78,6 @@ gdata_deps = [ dependency('gobject-2.0'), dependency('glib-2.0', version: '>= 2.62.0'), dependency('gio-2.0', version: '>= 2.44.0'), - dependency('gio-unix-2.0'), dependency('json-glib-1.0', version: '>= 0.15'), dependency('libxml-2.0'), ] |