FS-5588 --resolve windows compiler fixes

This commit is contained in:
Jeff Lenk 2013-07-09 07:53:56 -05:00
parent 2985d38f52
commit 5fc2bc9993
2 changed files with 6 additions and 6 deletions

View 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)) {

View 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;
}