From 981a41c317c397d4257842db296c72b5383585cc Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Thu, 20 Jun 2013 20:10:27 +0200
Subject: [PATCH] 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

https://bugs.freedesktop.org/show_bug.cgi?id=65977
---
 src/contact.h | 11 +----------
 1 file changed, 1 insertion(+), 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>
 
-- 
1.8.3.1