[vlc-commits] commit: GnuTLS: return WSAEWOULDBLOCK rather than WSAEINTR ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Fri Apr 16 16:07:39 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Apr 16 17:07:20 2010 +0300| [082f3b1a5daa96bfb6b8ce762f53ab7dd7093a85] | committer: Rémi Denis-Courmont 

GnuTLS: return WSAEWOULDBLOCK rather than WSAEINTR

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

 modules/misc/gnutls.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 10671c3..c38e8f7 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -165,11 +165,12 @@ static int gnutls_Error (vlc_object_t *obj, int val)
     switch (val)
     {
         case GNUTLS_E_AGAIN:
-#ifndef WIN32
+#ifdef WIN32
+            WSASetLastError (WSAEWOULDBLOCK);
+#else
             errno = EAGAIN;
-            break;
 #endif
-            /* WinSock does not return EAGAIN, return EINTR instead */
+            break;
 
         case GNUTLS_E_INTERRUPTED:
 #ifdef WIN32



More information about the vlc-commits mailing list