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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 33ed69b518accf19c81101eb8abb9c92a2ff8585..893df543776aa93dd67f18743a312413f09520a7 100644 (file)
--- 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 (file)
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