aboutsummaryrefslogtreecommitdiff
path: root/tests/server/sockfilt.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/server/sockfilt.c')
-rw-r--r--tests/server/sockfilt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 7e342e330..0900f6564 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -152,7 +152,7 @@ enum sockmode {
ACTIVE_DISCONNECT /* as a client, disconnected from server */
};
-#ifdef WIN32
+#ifdef _WIN32
/*
* read-wrapper to support reading from stdin on Windows.
*/
@@ -551,14 +551,14 @@ static unsigned int WINAPI select_ws_wait_thread(void *lpParameter)
continue;
}
else {
- logmsg("[select_ws_wait_thread] PeekNamedPipe len: %d", length);
+ logmsg("[select_ws_wait_thread] PeekNamedPipe len: %lu", length);
}
}
else {
/* if the pipe has NOT been closed, sleep and continue waiting */
ret = GetLastError();
if(ret != ERROR_BROKEN_PIPE) {
- logmsg("[select_ws_wait_thread] PeekNamedPipe error: %d", ret);
+ logmsg("[select_ws_wait_thread] PeekNamedPipe error: %lu", ret);
SleepEx(0, FALSE);
continue;
}
@@ -1159,8 +1159,8 @@ static bool juggle(curl_socket_t *sockfdp,
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
- logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
- sockfd, error, sstrerror(error));
+ logmsg("accept(%" CURL_FORMAT_SOCKET_T ", NULL, NULL) "
+ "failed with error: (%d) %s", sockfd, error, sstrerror(error));
}
else {
logmsg("====> Client connect");
@@ -1335,7 +1335,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
- logmsg("listen(%d, 5) failed with error: (%d) %s",
+ logmsg("listen(%" CURL_FORMAT_SOCKET_T ", 5) failed with error: (%d) %s",
sock, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
@@ -1461,7 +1461,7 @@ int main(int argc, char *argv[])
}
}
-#ifdef WIN32
+#ifdef _WIN32
win32_init();
atexit(win32_cleanup);