Change all uses of WIN32 to _WIN32

diff --git a/cmake/CheckFunctionExistsEx.c b/cmake/CheckFunctionExistsEx.c
index e3e9cb0f7c2a731be4dd552bf233c014e326fbe4..5ee3e5913a00840f265d10b7864198f81a863711 100644 (file)
--- a/cmake/CheckFunctionExistsEx.c
+++ b/cmake/CheckFunctionExistsEx.c
@@ -1,6 +1,6 @@
 #ifdef CHECK_FUNCTION_EXISTS
 
-#ifndef WIN32
+#ifndef _WIN32
 char CHECK_FUNCTION_EXISTS();
 #endif
 
@@ -11,7 +11,7 @@ int main(){
 #else
 int main(int ac, char*av[]){
 #endif
-#ifdef WIN32
+#ifdef _WIN32
   void * p = &CHECK_FUNCTION_EXISTS;
 #else
   CHECK_FUNCTION_EXISTS();

diff --git a/evutil.c b/evutil.c
index e49d744fed792a6ee197daa82bb590f624e5a7a1..c28caded59cad6704b076940c732d229e1b25476 100644 (file)
--- a/evutil.c
+++ b/evutil.c
@@ -1794,7 +1794,7 @@ evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
        int r;
        if (!buflen)
                return 0;
-#if defined(_MSC_VER) || defined(WIN32)
+#if defined(_MSC_VER) || defined(_WIN32)
        r = _vsnprintf(buf, buflen, format, ap);
        if (r < 0)
                r = _vscprintf(format, ap);

diff --git a/sample/dns-example.c b/sample/dns-example.c
index c4fb64a5eba4e46acb342214f833c1f64d251b11..15e48ce4bc66f60398084e30ae16789167df0a04 100644 (file)
--- a/sample/dns-example.c
+++ b/sample/dns-example.c
@@ -171,7 +171,7 @@ main(int c, char **v) {
                ++idx;
        }
 
-#ifdef WIN32
+#ifdef _WIN32
        {
                WSADATA WSAData;
                WSAStartup(0x101, &WSAData);

diff --git a/sample/https-client.c b/sample/https-client.c
index b40f92b9945ec53d43189e0cb6607e318cb80dd0..6a9d1bafa28b85ba0085ce538d8ff52d4cfaf279 100644 (file)
--- a/sample/https-client.c
+++ b/sample/https-client.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
@@ -196,7 +196,7 @@ main(int argc, char **argv)
        if (argc != 2)
                syntax();
 
-#ifdef WIN32
+#ifdef _WIN32
        {
                WORD wVersionRequested;
                WSADATA wsaData;
@@ -210,7 +210,7 @@ main(int argc, char **argv)
                        return 1;
                }
        }
-#endif
+#endif // _WIN32
 
        url = argv[1];
        http_uri = evhttp_uri_parse(url);
@@ -265,7 +265,7 @@ main(int argc, char **argv)
        if (!ssl_ctx)
                die_openssl("SSL_CTX_new");
 
-       #ifndef WIN32
+       #ifndef _WIN32
        /* TODO: Add certificate loading on Windows as well */
 
        /* Attempt to use the system's trusted root certificates.
@@ -298,7 +298,7 @@ main(int argc, char **argv)
         * "wrapping" OpenSSL's routine, not replacing it. */
        SSL_CTX_set_cert_verify_callback (ssl_ctx, cert_verify_callback,
                                          (void *) host);
-       #endif // not WIN32
+       #endif // not _WIN32
 
        // Create event base
        base = event_base_new();
@@ -359,7 +359,7 @@ main(int argc, char **argv)
        evhttp_connection_free(evcon);
        event_base_free(base);
 
-#ifdef WIN32
+#ifdef _WIN32
        WSACleanup();
 #endif
 

diff --git a/test/bench.c b/test/bench.c
index bdae7b1a9a50cc87a72a67b5dec7db4c2d43d6cc..3700505f38e48fd936aa9425dd9c61be804566fc 100644 (file)
--- a/test/bench.c
+++ b/test/bench.c
@@ -57,7 +57,7 @@
 #endif
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <getopt.h>
 #endif
 

diff --git a/test/bench_cascade.c b/test/bench_cascade.c
index d14af82b3cd34eb70a0b8d434a9ee0e25262a6b8..2d85cc1f1038995ed250628be6f71a7023201259 100644 (file)
--- a/test/bench_cascade.c
+++ b/test/bench_cascade.c
@@ -146,7 +146,7 @@ main(int argc, char **argv)
        struct timeval *tv;
 
        int num_pipes = 100;
-#ifdef WIN32
+#ifdef _WIN32
        WSADATA WSAData;
        WSAStartup(0x101, &WSAData);
 #endif
@@ -180,7 +180,7 @@ main(int argc, char **argv)
                        tv->tv_sec * 1000000L + tv->tv_usec);
        }
 
-#ifdef WIN32
+#ifdef _WIN32
        WSACleanup();
 #endif
 

diff --git a/test/bench_http.c b/test/bench_http.c
index c031f70f6625b50c2fd34e9121500ddfc173712c..255aae5798d3873ff0bb7561f2e8d79ec9f1cedb 100644 (file)
--- a/test/bench_http.c
+++ b/test/bench_http.c
@@ -184,7 +184,7 @@ main(int argc, char **argv)
        }
        event_base_dispatch(base);
 
-#ifdef WIN32
+#ifdef _WIN32
        WSACleanup();
 #endif