Define _WINSOCK_DEPRECATED_NO_WARNINGS in all MSVC builds.

Commit 0fb54de9a thought that this was only needed in VS2015 and later,
but buildfarm member woodlouse shows that at least VS2013 whines as
well.  Let's just define it regardless of MSVC version; it should be
harmless enough in older releases.

Also, in the wake of ed9b3606d, it seems better to put it in win32_port.h
where <winsock2.h> is included.

Since this is only suppressing a pedantic compiler warning, I don't
feel a need for a back-patch.

Discussion: https://postgr.es/m/20124.1510850225@sss.pgh.pa.us

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 123b2100f8dcf9f3a5ee4e763e9324b58c26c01e..611e04fac6661fa2c588c818315b60ecb9525cb5 100644 (file)
--- 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 db7dc16932d0e8fc13ea3f03e6b56148c3e5ae6b..46d7b0035f8e8d23e8e884a0138a72095bdb9725 100644 (file)
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -27,6 +27,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.