summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@humppa.nl>2013-06-20 20:10:27 +0200
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-06-24 14:26:41 +0100
commit090e456468d850076eaedbaeca8643d21310b1e0 (patch)
tree1b3c4456c9876b8997034e421d1f69d232ed7ce4 /src
parent83585d32f183e2a0262f0a62447c5e7f620ef5ca (diff)
downloadtelepathy-salut-090e456468d850076eaedbaeca8643d21310b1e0.tar.gz
Use gibber-sockets.h instead of manually including them.
On OpenBSD the lack of sys/socket.h being included here resulted in: error: field 'address' has incomplete type Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65977 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/contact.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/contact.h b/src/contact.h
index c7ba7461..d301e293 100644
--- a/src/contact.h
+++ b/src/contact.h
@@ -32,16 +32,7 @@
#include "olpc-activity.h"
#endif
-#ifdef G_OS_WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-
-/* Winsock makes some inappropriately-namespaced definitions */
-#undef interface
-#else
-#include <netinet/in.h>
-#endif
+#include <gibber/gibber-sockets.h>
#include <wocky/wocky.h>