From cab59c73fc616c23bf510dd875363da08ce1850c Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 5 Jun 2014 13:10:43 +0200 Subject: windows: Use WINAPI call convention for Windows API callbacks For x86_64 it does not actually matter, but for i686 builds the call convention is different with WINAPI. --- src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c') diff --git a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c index 5b44f85b5..62b3ea8dd 100644 --- a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c +++ b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c @@ -1545,9 +1545,9 @@ static traffic_selector_t *addr2ts(FWP_IP_VERSION version, void *data, /** * FwpmNetEventSubscribe0() callback */ -static void event_callback(private_kernel_wfp_ipsec_t *this, - const FWPM_NET_EVENT1 *event) +static void WINAPI event_callback(void *user, const FWPM_NET_EVENT1 *event) { + private_kernel_wfp_ipsec_t *this = user; traffic_selector_t *local = NULL, *remote = NULL; u_int8_t protocol = 0; u_int16_t from_local = 0, to_local = 65535; @@ -1610,7 +1610,7 @@ static bool register_events(private_kernel_wfp_ipsec_t *this) DWORD res; res = FwpmNetEventSubscribe0(this->handle, &subscription, - (void*)event_callback, this, &this->event); + event_callback, this, &this->event); if (res != ERROR_SUCCESS) { DBG1(DBG_KNL, "registering for WFP events failed: 0x%08x", res); -- cgit v1.2.3