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

@ -444,7 +444,7 @@ server_clear_identify(struct client *c)
}
void
server_callback_identify(unused int fd, unused short events, void *data)
server_callback_identify(__unused int fd, __unused short events, void *data)
{
struct client *c = data;