From 0968d71c96fa3589b46c29c0e4adb0d8f38ab082 Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Thu, 7 Dec 2017 08:28:06 -0500
Subject: [PATCH] Fixed build problems on Msys2

---
 httplib.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/httplib.h b/httplib.h
index 3a688bb..e5afb54 100644
--- a/httplib.h
+++ b/httplib.h
@@ -16,18 +16,16 @@
 #define _CRT_NONSTDC_NO_DEPRECATE
 #endif //_CRT_NONSTDC_NO_DEPRECATE
 
-#ifndef SO_SYNCHRONOUS_NONALERT
-#define SO_SYNCHRONOUS_NONALERT 0x20
-#endif
-#ifndef SO_OPENTYPE
-#define SO_OPENTYPE 0x7008
-#endif
-#if (_MSC_VER < 1900)
+#if (_MSC_VER && _MSC_VER < 1900)
 #define snprintf _snprintf_s
 #endif
 
+#ifndef S_ISREG
 #define S_ISREG(m)  (((m)&S_IFREG)==S_IFREG)
+#endif
+#ifndef S_ISDIR
 #define S_ISDIR(m)  (((m)&S_IFDIR)==S_IFDIR)
+#endif
 
 #include <fcntl.h>
 #include <io.h>
@@ -394,6 +392,9 @@ template <typename Fn>
 socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0)
 {
 #ifdef _WIN32
+#define SO_SYNCHRONOUS_NONALERT 0x20
+#define SO_OPENTYPE 0x7008
+
     int opt = SO_SYNCHRONOUS_NONALERT;
     setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char*)&opt, sizeof(opt));
 #endif