From 5fc2bc9993cebbce6648083b146a87ea7d41f70c Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 9 Jul 2013 07:53:56 -0500 Subject: [PATCH] FS-5588 --resolve windows compiler fixes --- libs/esl/fs_cli.c | 4 ++-- libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c index 393fcf80d3..5d87d521d3 100644 --- a/libs/esl/fs_cli.c +++ b/libs/esl/fs_cli.c @@ -764,8 +764,8 @@ static void *msg_thread_run(esl_thread_t *me, void *obj) SetConsoleTextAttribute(hStdout, colors[level]); } if (global_profile->log_uuid && !esl_strlen_zero(userdata)) { - WriteFile(hStdout, userdata, strlen(userdata), &outbytes, NULL); - WriteFile(hStdout, " ", strlen(" "), &outbytes, NULL); + WriteFile(hStdout, userdata, (DWORD)strlen(userdata), &outbytes, NULL); + WriteFile(hStdout, " ", (DWORD)strlen(" "), &outbytes, NULL); } WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); if(!(global_profile->batch_mode)) { diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c index 7e36b6e00d..33d984a9d5 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c @@ -360,9 +360,9 @@ issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) #ifdef _MSC_VER 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; } @@ -372,9 +372,9 @@ static int setup_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; }