telepathy-salut: Use gibber-sockets.h instead of manually including them.

[Simon McVittie]

Module: telepathy-salut
Branch: master
Commit: 090e456468d850076eaedbaeca8643d21310b1e0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=090e456468d850076eaedbaeca8643d21310b1e0

Author: Jasper Lievisse Adriaanse <jasper at humppa.nl>
Date:   Thu Jun 20 20:10:27 2013 +0200

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 at collabora.co.uk>

---

 src/contact.h |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/src/contact.h b/src/contact.h
index c7ba746..d301e29 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>