From 85fee2565364cb31b72252a07538c97a52e48ca7 Mon Sep 17 00:00:00 2001
From: Marcus Geelnard <marcus.geelnard@smarteye.se>
Date: Wed, 8 May 2019 14:59:06 +0200
Subject: MinGW fix: Use _MSC_VER instead of _WIN32 where appropriate

Use _MSC_VER (instead of _WIN32) for things that are specific for
Visual Studio.

Also remove #include <winsock2.h> from hiredis.h, as it leaks too
many symbols and defines into the global namespace, which is
undesirable for a public interface header. Anyone who uses the
the affected parts of the hiredis API needs to include the
appropriate headers anyway in order to declare struct timeval
variables.
---
 hiredis.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'hiredis.h')

diff --git a/hiredis.h b/hiredis.h
index 1ae1c0a..63eef3a 100644
--- a/hiredis.h
+++ b/hiredis.h
@@ -35,10 +35,10 @@
 #define __HIREDIS_H
 #include "read.h"
 #include <stdarg.h> /* for va_list */
-#ifndef _WIN32
+#ifndef _MSC_VER
 #include <sys/time.h> /* for struct timeval */
 #else
-#include <winsock2.h>
+struct timeval; /* forward declaration */
 #endif
 #include <stdint.h> /* uintXX_t, etc */
 #include "sds.h" /* for sds */
-- 
cgit v1.2.3