suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rktio: fix incorrect uses of errno

Browse Source 
Using `errno` is not right for Winsock.
This commit is contained in:
Matthew Flatt 2017-06-18 18:47:13 -06:00
parent 8449470db4
commit cdf22f7cdd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
racket/src/rktio/rktio_network.c
View File

@ -90,6 +90,11 @@ typedef struct SOCKADDR_IN rktio_unspec_address;
# define REGISTER_SOCKET(s) winsock_remember(s) # define REGISTER_SOCKET(s) winsock_remember(s)
# define UNREGISTER_SOCKET(s) winsock_forget(s) # define UNREGISTER_SOCKET(s) winsock_forget(s)
# ifdef errno
# undef errno
# endif
# define errno [do not use errno with winsock]
#endif #endif
static void do_get_socket_error(rktio_t *rktio) { static void do_get_socket_error(rktio_t *rktio) {
@ -1190,7 +1195,6 @@ static rktio_connect_t *try_connect(rktio_t *rktio, rktio_connect_t *conn)
status = WSAGetLastError(); status = WSAGetLastError();
inprogress = (status == WSAEWOULDBLOCK); inprogress = (status == WSAEWOULDBLOCK);
errno = status;
#endif #endif
conn->trying_fd = rktio_system_fd(rktio, conn->trying_fd = rktio_system_fd(rktio,
@ -1844,9 +1848,9 @@ rktio_length_and_addrinfo_t *rktio_udp_recvfrom(rktio_t *rktio, rktio_fd_t *rfd,
/* => data truncated on Windows, which counts as success on Unix */ /* => data truncated on Windows, which counts as success on Unix */
rn = len; rn = len;
break; break;
} else if (NOT_WINSOCK(errno == EINTR)) { } else if (NOT_WINSOCK(errid == EINTR)) {
/* try again */ /* try again */
} else if (WAS_EAGAIN(errno)) { } else if (WAS_EAGAIN(errid)) {
/* no data available */ /* no data available */
set_racket_error(RKTIO_ERROR_TRY_AGAIN); set_racket_error(RKTIO_ERROR_TRY_AGAIN);
return NULL; return NULL;