提交 5fc2bc99 authored 作者: Jeff Lenk's avatar Jeff Lenk

FS-5588 --resolve windows compiler fixes

上级 2985d38f
...@@ -764,8 +764,8 @@ static void *msg_thread_run(esl_thread_t *me, void *obj) ...@@ -764,8 +764,8 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
SetConsoleTextAttribute(hStdout, colors[level]); SetConsoleTextAttribute(hStdout, colors[level]);
} }
if (global_profile->log_uuid && !esl_strlen_zero(userdata)) { if (global_profile->log_uuid && !esl_strlen_zero(userdata)) {
WriteFile(hStdout, userdata, strlen(userdata), &outbytes, NULL); WriteFile(hStdout, userdata, (DWORD)strlen(userdata), &outbytes, NULL);
WriteFile(hStdout, " ", strlen(" "), &outbytes, NULL); WriteFile(hStdout, " ", (DWORD)strlen(" "), &outbytes, NULL);
} }
WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL);
if(!(global_profile->batch_mode)) { if(!(global_profile->batch_mode)) {
......
...@@ -360,9 +360,9 @@ issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -360,9 +360,9 @@ issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
#ifdef _MSC_VER #ifdef _MSC_VER
static int setup_socket(ws_socket_t sock) static int setup_socket(ws_socket_t sock)
{ {
unsigned log v = 1; unsigned long v = 1;
if (ioctlsocket(ssock, FIONBIO, &v) == SOCKET_ERROR) { if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR) {
return -1; return -1;
} }
...@@ -372,9 +372,9 @@ static int setup_socket(ws_socket_t sock) ...@@ -372,9 +372,9 @@ static int setup_socket(ws_socket_t sock)
static int restore_socket(ws_socket_t sock) static int restore_socket(ws_socket_t sock)
{ {
unsigned log v = 0; unsigned long v = 0;
if (ioctlsocket(ssock, FIONBIO, &v) == SOCKET_ERROR) { if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR) {
return -1; return -1;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论