[vlc-devel] commit: Contribs: live-win32-nonblock.patch is unneeded now ( applied upstream) (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Apr  9 22:34:25 2009 +0200| [02fc220d134c2d9a78873f9acb274c71debee65d] | committer: Jean-Baptiste Kempf 

Contribs: live-win32-nonblock.patch is unneeded now (applied upstream)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02fc220d134c2d9a78873f9acb274c71debee65d
---

 extras/contrib/src/Makefile                        |    3 ---
 .../contrib/src/Patches/live-win32-nonblock.patch  |   13 -------------
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 33ed69b..893df54 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1268,9 +1268,6 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/live-noapps.patch
 	patch -p0 < Patches/live-uselocale.patch
-ifdef HAVE_WIN32
-	patch -p0 < Patches/live-win32-nonblock.patch
-endif
 
 .live: live
 ifdef HAVE_WIN32
diff --git a/extras/contrib/src/Patches/live-win32-nonblock.patch b/extras/contrib/src/Patches/live-win32-nonblock.patch
deleted file mode 100644
index f6d3bdf..0000000
--- a/extras/contrib/src/Patches/live-win32-nonblock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 2009 Rémi Denis-Courmont. Licensed under GPLv2 or higher.
-diff -Nru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
---- live.orig/liveMedia/RTSPClient.cpp	2009-04-05 20:38:11.000000000 +0300
-+++ live/liveMedia/RTSPClient.cpp	2009-04-05 20:39:43.000000000 +0300
-@@ -1835,7 +1835,7 @@
-       }
-       if (connect(fInputSocketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
- #if defined(__WIN32__) || defined(_WIN32)
--        if (errno != WSAEINPROGRESS) {
-+        if (errno != WSAEWOULDBLOCK) {
- #else
-         if (errno != EINPROGRESS) {
- #endif