Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-18 16:01:23 +00:00
31 changed files with 141 additions and 83 deletions

View File

@ -300,7 +300,7 @@ server_update_socket(void)
/* Callback for server socket. */
void
server_accept(int fd, short events, unused void *data)
server_accept(int fd, short events, __unused void *data)
{
struct sockaddr_storage sa;
socklen_t slen = sizeof sa;