diff options
| author | Martin Willi <martin@revosec.ch> | 2014-06-06 16:32:31 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-06 16:33:50 +0200 |
| commit | 4f31b3f7243d4d368ac88bda6af477e542d77aae (patch) | |
| tree | 1e931ba67796aece980de91caa301cb2ae196ed6 /src/libcharon/plugins/socket_win/socket_win_socket.c | |
| parent | 9d228ddb04b7adc7c5904b98bc7857b12176904a (diff) | |
| parent | fd372e13a238180102168770ff8e60c82ba59da2 (diff) | |
| download | strongswan-4f31b3f7243d4d368ac88bda6af477e542d77aae.tar.bz2 strongswan-4f31b3f7243d4d368ac88bda6af477e542d77aae.tar.xz | |
Merge branch 'win-32bit'
Fixes some issues when building 32-bit Windows binaries. Mostly related
to the call API. Introduces a Travis 32-bit Windows build variant.
Diffstat (limited to 'src/libcharon/plugins/socket_win/socket_win_socket.c')
| -rw-r--r-- | src/libcharon/plugins/socket_win/socket_win_socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcharon/plugins/socket_win/socket_win_socket.c b/src/libcharon/plugins/socket_win/socket_win_socket.c index 2cd951d8f..cf7a2ce5a 100644 --- a/src/libcharon/plugins/socket_win/socket_win_socket.c +++ b/src/libcharon/plugins/socket_win/socket_win_socket.c @@ -75,14 +75,14 @@ struct private_socket_win_socket_t { /** * WSASendMsg function */ - int (*WSASendMsg)(SOCKET, LPWSAMSG, DWORD, LPDWORD, - LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); + int WINAPI (*WSASendMsg)(SOCKET, LPWSAMSG, DWORD, LPDWORD, + LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); /** * WSARecvMsg function */ - int (*WSARecvMsg)(SOCKET, LPWSAMSG, LPDWORD, - LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); + int WINAPI (*WSARecvMsg)(SOCKET, LPWSAMSG, LPDWORD, + LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); }; METHOD(socket_t, receiver, status_t, |