Implemented fixes allowing libwebsockets to be built under Windows using MinGM/MSYS

[platform/upstream/libwebsockets.git] / test-server / test-ping.c

diff --git a/test-server/test-ping.c b/test-server/test-ping.c
index f414b08..d5b7c8e 100644 (file)
--- a/test-server/test-ping.c
+++ b/test-server/test-ping.c
@@ -26,6 +26,8 @@
 #include <signal.h>
 #include <sys/types.h>
 
+#include "../lib/libwebsockets.h"
+
 #ifndef _WIN32
 #include <netdb.h>
 #include <sys/socket.h>
@@ -33,10 +35,10 @@
 #include <sys/ioctl.h>
 #include <poll.h>
 #include <unistd.h>
+#else
+#include "gettimeofday.h"
 #endif
 
-#include "../lib/libwebsockets.h"
-
 /*
  * this is specified in the 04 standard, control frames can only have small
  * payload length styles
@@ -312,7 +314,7 @@ static struct option options[] = {
        { NULL, 0, 0, 0 }
 };
 
-#ifndef WIN32
+#ifndef _WIN32
 static void
 signal_handler(int sig, siginfo_t *si, void *v)
 {
@@ -331,7 +333,7 @@ int main(int argc, char **argv)
        struct libwebsocket_context *context;
        char protocol_name[256];
        char ip[30];
-#ifndef WIN32
+#ifndef _WIN32
        struct sigaction sa;
        struct winsize w;
 #endif
@@ -414,7 +416,7 @@ int main(int argc, char **argv)
                }
        }
 
-#ifndef WIN32
+#ifndef _WIN32
        if (isatty(STDOUT_FILENO))
                if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1)
                        if (w.ws_col > 0)
@@ -456,7 +458,7 @@ int main(int argc, char **argv)
        fprintf(stderr, "Websocket PING %s (%s) %d bytes of data.\n",
                                                           peer_name, ip, size);
 
-#ifndef WIN32
+#ifndef _WIN32
        /* set the ^C handler */
        sa.sa_sigaction = signal_handler;
        sa.sa_flags = SA_SIGINFO;