aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/port/win32.h3
-rw-r--r--src/include/port/win32_port.h8
2 files changed, 8 insertions, 3 deletions
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 123b2100f8d..611e04fac66 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -15,11 +15,8 @@
* Studio 2015 the minimum requirement is Windows Vista (0x0600) to
* get support for GetLocaleInfoEx() with locales. For everything else
* the minimum version is Windows XP (0x0501).
- * Also for VS2015, add a define that stops compiler complaints about
- * using the old Winsock API.
*/
#if defined(_MSC_VER) && _MSC_VER >= 1900
-#define _WINSOCK_DEPRECATED_NO_WARNINGS
#define MIN_WINNT 0x0600
#else
#define MIN_WINNT 0x0501
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index db7dc16932d..46d7b0035f8 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -28,6 +28,14 @@
#undef ERROR
/*
+ * VS2013 and later issue warnings about using the old Winsock API,
+ * which we don't really want to hear about.
+ */
+#ifdef _MSC_VER
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#endif
+
+/*
* The MinGW64 headers choke if this is already defined - they
* define it themselves.
*/