diff mbox series

[COMMITED] ada: Remove socket definitions for ancient MinGW

Message ID 20220926091341.272596-1-poulhies@adacore.com
State Committed
Commit 092d7509db47376a7b910f7af05678058bd9bd3c
Headers
Series [COMMITED] ada: Remove socket definitions for ancient MinGW |

Commit Message

Marc Poulhiès Sept. 26, 2022, 9:13 a.m. UTC 
  From: Piotr Trojanek <trojanek@adacore.com>

Modern MinGW defines _WIN32_WINNT as 0xa00, so there is no need go guard
against it being lower than 0x0600 or setting it to 0x0501.

gcc/ada/

	* gsocket.h: Remove redefinition of _WIN32_WINNT.
	* mingw32.h: Remove conditional definition of _WIN32_WINNT.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/gsocket.h | 6 ------
 gcc/ada/mingw32.h | 5 -----
 2 files changed, 11 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
index e7284a1ef4e..561f2ffb566 100644
--- a/gcc/ada/gsocket.h
+++ b/gcc/ada/gsocket.h
@@ -80,12 +80,6 @@ 
 #define FD_SETSIZE 1024
 
 #ifdef __MINGW32__
-/* winsock2.h allows WSAPoll related definitions only when
- * _WIN32_WINNT >= 0x0600 */
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
-#define _WIN32_WINNT 0x0600
-#endif
-
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <versionhelpers.h>
diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h
index a190d51076f..d038211a1dc 100644
--- a/gcc/ada/mingw32.h
+++ b/gcc/ada/mingw32.h
@@ -44,11 +44,6 @@ 
 #define UNICODE  /* For Win32 API */
 #endif
 
-/* We need functionality available only starting with Windows XP */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-
 #ifndef __CYGWIN__
 #include <tchar.h>
 #endif