From: Etienne Dechamps <etienne@edechamps.fr>
Date: Sat, 12 Jul 2014 11:54:45 +0000 (+0100)
Subject: Fix callback signature for TAP-Win32 device_handle_read().
X-Git-Tag: release-1.1pre11~63^2~3
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=2d2e94406c5f595eff67a01ee6bb1190f77c37ff;p=tinc

Fix callback signature for TAP-Win32 device_handle_read().

This fixes the following compiler warning when building for Windows:

mingw/device.c: In function ‘setup_device’:
mingw/device.c:186:2: error: passing argument 2 of ‘io_add_event’ from incompatible pointer type [-Werror]
  io_add_event(&device_read_io, device_handle_read, NULL, CreateEvent(NULL, TRUE, FALSE, NULL));
  ^
In file included from mingw/../net.h:27:0,
                 from mingw/../subnet.h:24,
                 from mingw/../conf.h:34,
                 from mingw/device.c:26:
mingw/../event.h:61:13: note: expected ‘io_cb_t’ but argument is of type ‘void (*)(void *)’
 extern void io_add_event(io_t *io, io_cb_t cb, void* data, WSAEVENT event);
---

diff --git a/src/mingw/device.c b/src/mingw/device.c
index 33b13da6..10f7abce 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -60,7 +60,7 @@ static void device_issue_read() {
 	}
 }
 
-static void device_handle_read(void *data) {
+static void device_handle_read(void *data, int flags) {
 	ResetEvent(device_read_overlapped.hEvent);
 
 	DWORD len;