]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-5588 --resolve windows compiler fixes
authorJeff Lenk <jeff@jefflenk.com>
Tue, 9 Jul 2013 12:53:56 +0000 (07:53 -0500)
committerJeff Lenk <jeff@jefflenk.com>
Tue, 9 Jul 2013 12:53:56 +0000 (07:53 -0500)
libs/esl/fs_cli.c
libs/sofia-sip/libsofia-sip-ua/tport/ws.c

index 393fcf80d3a828f38e4ae21f9b0b86b6705cf4df..5d87d521d3235d9d673550b96aa3206b554281c0 100644 (file)
@@ -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)) {
index 7e36b6e00dfef8bed34305253bd87e9225de0336..33d984a9d582e73312ddba5df170b363958c2b96 100644 (file)
@@ -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;
        }