Kouhei Sutou
null+****@clear*****
Thu Oct 30 20:31:23 JST 2014
Kouhei Sutou 2014-10-30 20:31:23 +0900 (Thu, 30 Oct 2014) New Revision: 3d93c67166a7751b68d55b199a562e2b091249ce https://github.com/groonga/groonga/commit/3d93c67166a7751b68d55b199a562e2b091249ce Message: windows: suppress a warning groonga.c: In function 'h_output': groonga.c:696:9: warning: passing argument 4 of 'WSASend' from incompatible pointer type if (WSASend(fd, wsabufs, 4, &ret, 0, NULL, NULL) == SOCKET_ERROR) { ^ In file included from ../lib/grn.h:103:0, from groonga.c:22: /usr/share/mingw-w64/include/winsock2.h:1048:34: note: expected 'LPDWORD' but argument is of type 'ssize_t *' WINSOCK_API_LINKAGE int WSAAPI WSASend(SOCKET s,LPWSABUF lpBuffers,DWORD dwBufferCount,LPDWORD lpNumberOfBytesSent,DWORD dwFlags,LPWSAOVERLAPPED lpOverlapped,LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); ^ Modified files: src/groonga.c Modified: src/groonga.c (+6 -2) =================================================================== --- src/groonga.c 2014-10-30 20:28:29 +0900 (a1064b2) +++ src/groonga.c 2014-10-30 20:31:23 +0900 (88f160d) @@ -693,8 +693,12 @@ h_output(grn_ctx *ctx, int flags, void *arg) wsabufs[2].len = GRN_TEXT_LEN(outbuf); wsabufs[3].buf = GRN_TEXT_VALUE(&foot); wsabufs[3].len = GRN_TEXT_LEN(&foot); - if (WSASend(fd, wsabufs, 4, &ret, 0, NULL, NULL) == SOCKET_ERROR) { - SERR("WSASend"); + { + DWORD sent; + if (WSASend(fd, wsabufs, 4, &sent, 0, NULL, NULL) == SOCKET_ERROR) { + SERR("WSASend"); + } + ret = sent; } #else /* WIN32 */ struct iovec msg_iov[4]; -------------- next part -------------- HTML����������������������������...Download