From 49a25f346d4c614fe3d21168f3ca50c005790834 Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk@gmail.com>
Date: Sun, 10 Jun 2012 00:07:40 +0300
Subject: [PATCH] win32: fix broken libc calls

read(), write() & friends require inclusion of win32/win32dep.h so that
the correct libpurple win32 libc wrappers are called. Only then sockets
are working correctly.

This fixes the write error for TCP connections on win32.
(cherry picked from commit 9488cc344c364bc5b5528afe64b1c4362d0b03c8)
---
 src/purple/purple-dnsquery.c  | 3 ++-
 src/purple/purple-ft.c        | 3 ++-
 src/purple/purple-media.c     | 5 +++++
 src/purple/purple-network.c   | 4 ++--
 src/purple/purple-transport.c | 5 +++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/purple/purple-dnsquery.c b/src/purple/purple-dnsquery.c
index 0a37c418..e9dcc6da 100644
--- a/src/purple/purple-dnsquery.c
+++ b/src/purple/purple-dnsquery.c
@@ -21,7 +21,8 @@
  */
 
 #ifdef _WIN32
-#include "win32/win32dep.h" /* for inet_ntop() */
+/* wrappers for write() & friends for socket handling */
+#include "win32/win32dep.h"
 #include <ws2tcpip.h>
 #else
 #include <arpa/inet.h>
diff --git a/src/purple/purple-ft.c b/src/purple/purple-ft.c
index 6dc2214f..0d5a7c09 100644
--- a/src/purple/purple-ft.c
+++ b/src/purple/purple-ft.c
@@ -36,7 +36,8 @@
 #include "version.h"
 
 #ifdef _WIN32
-#include "win32/libc_interface.h"
+/* wrappers for write() & friends for socket handling */
+#include "win32/win32dep.h"
 #endif
 
 #include "sipe-common.h"
diff --git a/src/purple/purple-media.c b/src/purple/purple-media.c
index 0c929212..2e71c69f 100644
--- a/src/purple/purple-media.c
+++ b/src/purple/purple-media.c
@@ -35,6 +35,11 @@
 #include "mediamanager.h"
 #include "agent.h"
 
+#ifdef _WIN32
+/* wrappers for write() & friends for socket handling */
+#include "win32/win32dep.h"
+#endif
+
 #include "sipe-backend.h"
 #include "sipe-core.h"
 
diff --git a/src/purple/purple-network.c b/src/purple/purple-network.c
index 52001017..f5f6656a 100644
--- a/src/purple/purple-network.c
+++ b/src/purple/purple-network.c
@@ -32,8 +32,8 @@
 #include "version.h"
 
 #ifdef _WIN32
-/* for network */
-#include "win32/libc_interface.h"
+/* wrappers for write() & friends for socket handling */
+#include "win32/win32dep.h"
 #include <nspapi.h>
 #else
 #include <sys/types.h>
diff --git a/src/purple/purple-transport.c b/src/purple/purple-transport.c
index b67661f8..2206e087 100644
--- a/src/purple/purple-transport.c
+++ b/src/purple/purple-transport.c
@@ -40,6 +40,11 @@
 #include "proxy.h"
 #include "sslconn.h"
 
+#ifdef _WIN32
+/* wrappers for write() & friends for socket handling */
+#include "win32/win32dep.h"
+#endif
+
 #include "purple-private.h"
 
 #include "sipe-backend.h"
-- 
2.11.4.GIT