From 3af860b877587ab276388956e797a7ad04cd41e3 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 29 Aug 2008 20:05:08 +0000
Subject: Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H. This is
 what it is called in FFmpeg and more consistent with other names for similar
 conditionals. This fixes a potential compilation failure on MinGW, as
 described in Bugzilla #1262.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/network.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'stream/network.h')

diff --git a/stream/network.h b/stream/network.h
index 6aa0457fb2..b3d6abc8c4 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 
 #include "config.h"
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-- 
cgit v1.2.3


From c152b07e661cbc274cd4979e6b5e053a64656476 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 29 Aug 2008 22:55:39 +0000
Subject: Move duplicated '#define closesocket close' into network.h along with
 network-related #include #ifdeffery.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/network.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'stream/network.h')

diff --git a/stream/network.h b/stream/network.h
index b3d6abc8c4..5ec0233648 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -17,6 +17,10 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#define closesocket close
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #endif
 
 #include "url.h"
-- 
cgit v1.2.3


From f27f04a53d56a5b6ca89e80a67c140b6f009c439 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 31 Aug 2008 13:59:54 +0000
Subject: Revert moving closesocket definition and network headers to
 network.h. This caused lots of trouble on MinGW, we need a different
 solution.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/network.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'stream/network.h')

diff --git a/stream/network.h b/stream/network.h
index 5ec0233648..b3d6abc8c4 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -17,10 +17,6 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
 #endif
 
 #include "url.h"
-- 
cgit v1.2.3


From 788a4d5f913fd4100f2163cf2e4e4a4a487f21ef Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 1 Sep 2008 07:31:57 +0000
Subject: Move '#define closesocket close' preprocessor directive to a common
 place and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27505 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/network.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'stream/network.h')

diff --git a/stream/network.h b/stream/network.h
index b3d6abc8c4..76e2e6d520 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -22,6 +22,10 @@
 #include "url.h"
 #include "http.h"
 
+#ifndef HAVE_CLOSESOCKET
+#define closesocket close
+#endif
+
 #define BUFFER_SIZE		2048
 
 typedef struct {
-- 
cgit v1.2.3