Attachment 116152 Details for Bug 90773 – patch that fixes all errno defines

patch that fixes all errno defines

0001-core-make-sure-we-use-the-correct-win32-socket-errno.patch (text/plain), 3.88 KB, created by Pierre Ossman on 2015-05-29 14:46:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2015-05-29 14:46:14 UTC

Size: 3.88 KB

patch

obsolete

>From 2586013323b7679683e5563ecefb5134ea78e791 Mon Sep 17 00:00:00 2001
>From: Pierre Ossman <ossman@cendio.se>
>Date: Fri, 29 May 2015 16:39:45 +0200
>Subject: [PATCH] core: make sure we use the correct win32 socket errno:s
>
>Modern versions of MinGW and Visual Studio provide socket errno
>defines that make no sense (no API sets them). Make sure we
>continue to use the old WSAE ones that are actually returned by
>Windows' socket API.
>
>Signed-off-by: Pierre Ossman <ossman@cendio.se>
>---
> src/pulsecore/socket.h   | 13 +------
> src/pulsecore/winerrno.h | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 90 insertions(+), 12 deletions(-)
> create mode 100644 src/pulsecore/winerrno.h
>
>diff --git a/src/pulsecore/socket.h b/src/pulsecore/socket.h
>index 0d38bee..72f2228 100644
>--- a/src/pulsecore/socket.h
>+++ b/src/pulsecore/socket.h
>@@ -7,18 +7,7 @@
> 
> #ifdef HAVE_WINSOCK2_H
> #include <winsock2.h>
>-
>-#define ESHUTDOWN       WSAESHUTDOWN
>-#define ECONNRESET      WSAECONNRESET
>-#define ECONNABORTED    WSAECONNABORTED
>-#define ENETRESET       WSAENETRESET
>-#define EINPROGRESS     WSAEINPROGRESS
>-#define EAFNOSUPPORT    WSAEAFNOSUPPORT
>-#define ETIMEDOUT       WSAETIMEDOUT
>-#define ECONNREFUSED    WSAECONNREFUSED
>-#define EHOSTUNREACH    WSAEHOSTUNREACH
>-#define EWOULDBLOCK     WSAEWOULDBLOCK
>-#define EADDRINUSE      WSAEADDRINUSE
>+#include "winerrno.h"
> 
> typedef long suseconds_t;
> 
>diff --git a/src/pulsecore/winerrno.h b/src/pulsecore/winerrno.h
>new file mode 100644
>index 0000000..052d4de
>--- /dev/null
>+++ b/src/pulsecore/winerrno.h
>@@ -0,0 +1,89 @@
>+
>+/* Generated with:
>+cat /usr/i686-pc-mingw32/sys-root/mingw/include/winerror.h \
>+ | awk '/#define WSAE.*WSABASE/{gsub("WSA", ""); print "#undef " $2 "\n#define " $2 " WSA" $2}' \
>+ | egrep -v 'EINTR|EBADF|EACCES|EFAULT|EINVAL|EMFILE|_QOS|PROVIDER|PROCTABLE'
>+*/
>+
>+#undef EWOULDBLOCK
>+#define EWOULDBLOCK WSAEWOULDBLOCK
>+#undef EINPROGRESS
>+#define EINPROGRESS WSAEINPROGRESS
>+#undef EALREADY
>+#define EALREADY WSAEALREADY
>+#undef ENOTSOCK
>+#define ENOTSOCK WSAENOTSOCK
>+#undef EDESTADDRREQ
>+#define EDESTADDRREQ WSAEDESTADDRREQ
>+#undef EMSGSIZE
>+#define EMSGSIZE WSAEMSGSIZE
>+#undef EPROTOTYPE
>+#define EPROTOTYPE WSAEPROTOTYPE
>+#undef ENOPROTOOPT
>+#define ENOPROTOOPT WSAENOPROTOOPT
>+#undef EPROTONOSUPPORT
>+#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
>+#undef ESOCKTNOSUPPORT
>+#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
>+#undef EOPNOTSUPP
>+#define EOPNOTSUPP WSAEOPNOTSUPP
>+#undef EPFNOSUPPORT
>+#define EPFNOSUPPORT WSAEPFNOSUPPORT
>+#undef EAFNOSUPPORT
>+#define EAFNOSUPPORT WSAEAFNOSUPPORT
>+#undef EADDRINUSE
>+#define EADDRINUSE WSAEADDRINUSE
>+#undef EADDRNOTAVAIL
>+#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
>+#undef ENETDOWN
>+#define ENETDOWN WSAENETDOWN
>+#undef ENETUNREACH
>+#define ENETUNREACH WSAENETUNREACH
>+#undef ENETRESET
>+#define ENETRESET WSAENETRESET
>+#undef ECONNABORTED
>+#define ECONNABORTED WSAECONNABORTED
>+#undef ECONNRESET
>+#define ECONNRESET WSAECONNRESET
>+#undef ENOBUFS
>+#define ENOBUFS WSAENOBUFS
>+#undef EISCONN
>+#define EISCONN WSAEISCONN
>+#undef ENOTCONN
>+#define ENOTCONN WSAENOTCONN
>+#undef ESHUTDOWN
>+#define ESHUTDOWN WSAESHUTDOWN
>+#undef ETOOMANYREFS
>+#define ETOOMANYREFS WSAETOOMANYREFS
>+#undef ETIMEDOUT
>+#define ETIMEDOUT WSAETIMEDOUT
>+#undef ECONNREFUSED
>+#define ECONNREFUSED WSAECONNREFUSED
>+#undef ELOOP
>+#define ELOOP WSAELOOP
>+#undef ENAMETOOLONG
>+#define ENAMETOOLONG WSAENAMETOOLONG
>+#undef EHOSTDOWN
>+#define EHOSTDOWN WSAEHOSTDOWN
>+#undef EHOSTUNREACH
>+#define EHOSTUNREACH WSAEHOSTUNREACH
>+#undef ENOTEMPTY
>+#define ENOTEMPTY WSAENOTEMPTY
>+#undef EPROCLIM
>+#define EPROCLIM WSAEPROCLIM
>+#undef EUSERS
>+#define EUSERS WSAEUSERS
>+#undef EDQUOT
>+#define EDQUOT WSAEDQUOT
>+#undef ESTALE
>+#define ESTALE WSAESTALE
>+#undef EREMOTE
>+#define EREMOTE WSAEREMOTE
>+#undef EDISCON
>+#define EDISCON WSAEDISCON
>+#undef ENOMORE
>+#define ENOMORE WSAENOMORE
>+#undef ECANCELLED
>+#define ECANCELLED WSAECANCELLED
>+#undef EREFUSED
>+#define EREFUSED WSAEREFUSED
>-- 
>2.1.0
>

Actions: View

Attachments on bug 90773: 116152

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.