cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-17 08:17:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace sole internal user of socklen_t with ev_socklen_t

Browse Source 
This lets us remove the socklen_t definition from util-internal.h,
so that util-internal.h no longer confuses ws2tcpip.h
This commit is contained in:
Nick Mathewson 2012-02-28 13:21:05 -05:00
parent 066775e366
commit 92385a9f3c
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
listener.c
View File

@ -387,11 +387,7 @@ listener_read_cb(evutil_socket_t fd, short what, void *p)
LOCK(lev); LOCK(lev);
while (1) { while (1) {
struct sockaddr_storage ss; struct sockaddr_storage ss;
#ifdef _WIN32 ev_socklen_t socklen = sizeof(ss);
int socklen = sizeof(ss);
#else
socklen_t socklen = sizeof(ss);
#endif
evutil_socket_t new_fd = evutil_accept4(fd, (struct sockaddr*)&ss, &socklen, lev->accept4_flags); evutil_socket_t new_fd = evutil_accept4(fd, (struct sockaddr*)&ss, &socklen, lev->accept4_flags);
if (new_fd < 0) if (new_fd < 0)
break; break;

4
util-internal.h
View File

@ -112,10 +112,6 @@ extern "C" {
#endif #endif
#ifdef _EVENT_socklen_t
#define socklen_t _EVENT_socklen_t
#endif
/* Arguments for shutdown() */ /* Arguments for shutdown() */
#ifdef SHUT_RD #ifdef SHUT_RD
#define EVUTIL_SHUT_RD SHUT_RD #define EVUTIL_SHUT_RD SHUT_RD