Fix some Windows warnings

graphics.c

@@ -66,7 +66,7 @@ static void *recv_thread(void *arg) {
         perror("recv");
       break;
     } else if (bytes_received > LEN_FORMATTED_MSG) {
-      fprintf(stderr, "Packet length exceeded by %ld bytes\n", bytes_received - LEN_FORMATTED_MSG);
+      fprintf(stderr, "Packet length exceeded by %zd bytes\n", bytes_received - LEN_FORMATTED_MSG);
       break;
     }
 

tcp_file_transfer_client.c

@@ -48,7 +48,7 @@ int func(socket_t sockfd, const char *file) {
     exit(errno);
   }
   long len = ftell(fp);
-  printf("file length: %li\n", len);
+  printf("file length: %zd\n", len);
   rewind(fp);
 
   // basename() may modify the contents of 'file', so create a copy
@@ -71,7 +71,7 @@ int func(socket_t sockfd, const char *file) {
     }
     send(sockfd, buff, num, 0);
     n_bytes_total += num;
-    printf("bytes sent: %li\r", n_bytes_total);
+    printf("bytes sent: %zu\r", n_bytes_total);
 
   } while (feof(fp) == 0);
 

tcp_file_transfer_server.c

@@ -105,7 +105,7 @@ static int recv_file(socket_t sockfd) {
           }
           n_bytes_total += n_bytes_recvd;
         }
-        printf("bytes received: %li\r", n_bytes_total);
+        printf("bytes received: %zd\r", n_bytes_total);
       }
     }
   }
@@ -135,13 +135,13 @@ static int recv_file(socket_t sockfd) {
     printf("Poll timed out!\n");
   } else {
     if (pfds[0].revents & POLLOUT) {
-      snprintf(buff, sizeof buff, "%s %li bytes",
+      snprintf(buff, sizeof buff, "%s %zd bytes",
                f_exists == 0 ? "Received " : "File already exists. Received", n_bytes_total);
       puts(buff);
       puts("Sending confirmation to client");
       ssize_t s_r = send(pfds[0].fd, buff, strlen(buff) + 1, 0);
       if (s_r >= 0)
-        printf("%li bytes sent\n", s_r);
+        printf("%zd bytes sent\n", s_r);
       else
         perror("send");
     }

udp_echo_client.c

@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
       return -1;
     }
 
-    printf("Received %ld bytes: %s\n\n", (long)nread, buf);
+    printf("Received %zu bytes: %s\n\n", nread, buf);
 
     if (strncasecmp(buf, "exit", 4) == 0) {
       close(socket_info.sockfd);

udp_echo_server.c

@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
     int s = getnameinfo((struct sockaddr *)&peer_addr, peer_addr_len, host, NI_MAXHOST, service,
                         NI_MAXSERV, NI_NUMERICSERV);
     if (s == 0)
-      printf("Received %ld bytes from %s:%s\n", (long)nread, host, service);
+      printf("Received %zd bytes from %s:%s\n", nread, host, service);
     else
       fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));
 

util.c

@@ -5,10 +5,6 @@
 
 #include "util.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 volatile sig_atomic_t stop = 0;
 
 #ifdef _WIN32

util.h

@@ -1,12 +1,16 @@
 #pragma once
 #include <signal.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include "netex.h"
 
 extern volatile sig_atomic_t stop;
 
 #ifdef _WIN32_
-BOOL WINAPI console_handler(DWORD signal_type)
+BOOL WINAPI console_handler(DWORD signal_type);
 #else
 void signal_handler(int signum);
 #endif