diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-05-29 16:54:21 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-05-29 16:58:02 +0200 |
| commit | 500cb6ef11a52345bf49e751976bff386e6e09ef (patch) | |
| tree | 9b6a25d9dafc5d28fe58f9bda3fee3fbd814f158 /common/os | |
| parent | 7495b822fd4571312a1f0db9517f1046abc2a746 (diff) | |
| download | tigervnc-500cb6ef11a52345bf49e751976bff386e6e09ef.tar.gz tigervnc-500cb6ef11a52345bf49e751976bff386e6e09ef.zip | |
Fix Winsock errno code overlap
Some Winsock errno:s conflict with the standard ones. Try to
restrict the redefines to things relevant for sockets.
Diffstat (limited to 'common/os')
| -rw-r--r-- | common/os/winerrno.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/common/os/winerrno.h b/common/os/winerrno.h index aebbdbe7..052d4de2 100644 --- a/common/os/winerrno.h +++ b/common/os/winerrno.h @@ -2,21 +2,9 @@ /* 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 '_QOS|PROVIDER|PROCTABLE' + | egrep -v 'EINTR|EBADF|EACCES|EFAULT|EINVAL|EMFILE|_QOS|PROVIDER|PROCTABLE' */ -#undef EINTR -#define EINTR WSAEINTR -#undef EBADF -#define EBADF WSAEBADF -#undef EACCES -#define EACCES WSAEACCES -#undef EFAULT -#define EFAULT WSAEFAULT -#undef EINVAL -#define EINVAL WSAEINVAL -#undef EMFILE -#define EMFILE WSAEMFILE #undef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK #undef EINPROGRESS |