Re: [PATCH 2/2] Implement target async for Windows

[Jon Turney <jon.turney@dronecode.org.uk>]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

On 08/11/2022 18:38, Tom Tromey via Gdb-patches wrote:
>>>>>> "Jon" == Jon Turney <jon.turney@dronecode.org.uk> writes:
> 
> Jon> I'm going to suggest the attached to fix this, but from a quick
> Jon> reading of the patch, I just wonder if winsock2.h is actually needed
> Jon> at all, as I don't immediately see anything that leaps out as needing
> Jon> it...
> 
> I don't remember why I added it, but I suspect you're right and that the
> include can just be removed.

I tested building on MSYS2 with that removed, which appears to be 
successful, so I've pushed as trivial the attached.


[-- Attachment #2: 0001-Drop-apparently-unneeded-include-of-winsock2.h.patch --]
[-- Type: text/plain, Size: 896 bytes --]

From 90f902daf5edb817d57b5e377d7ad54948a5a9f4 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 2 Nov 2022 14:32:55 +0000
Subject: [PATCH] Drop apparently unneeded include of winsock2.h

Commit d08bae3d ("Implement target async for Windows") unconditionally
includes winsock2.h.  We don't want to do that on Cygwin, since
including both winsock2.h and sys/select.h causes incompatible
redefinition problems.

Since that include is apparently unneeded, just drop it.

Fixes: d08bae3d
---
 gdb/windows-nat.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index ab94de03bbf..6250cbc27a5 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -34,7 +34,6 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <winsock2.h>
 #include <windows.h>
 #include <imagehlp.h>
 #ifdef __CYGWIN__
-- 
2.38.1