From 16ea45e93159195dcad08a6f05fe55b7cc8c1506 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat, 14 Mar 2026 16:52:25 -0700
Subject: [PATCH] os: use winsock2.h definitions on mingw in xserver_poll.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Avoids build warnings & failures, such as:

../os/xserver_poll.h:40: warning: "POLLNVAL" redefined
   40 | #define POLLNVAL        0x20
      |
/usr/share/mingw-w64/include/winsock2.h:1190: note: this is the location
 of the previous definition
 1190 | #define POLLNVAL   0x0004
      |
../os/xserver_poll.h:42:8: error: redefinition of ‘struct pollfd’
   42 | struct pollfd
      |        ^~~~~~
/usr/share/mingw-w64/include/winsock2.h:1192:16: note: originally defined here
 1192 | typedef struct pollfd {
      |                ^~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2141>
---
 os/xserver_poll.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/os/xserver_poll.h b/os/xserver_poll.h
index 0f3a37c73..070bd745a 100644
--- a/os/xserver_poll.h
+++ b/os/xserver_poll.h
@@ -32,6 +32,9 @@
 #define xserver_poll(fds, nfds, timeout) poll(fds, nfds, timeout)
 #else
 
+#ifdef __MINGW32__
+#include <X11/Xwinsock.h>
+#else
 #define POLLIN		0x01
 #define POLLPRI		0x02
 #define POLLOUT		0x04
@@ -45,6 +48,7 @@ struct pollfd
     short   events;
     short   revents;
 };
+#endif
 
 typedef unsigned long nfds_t;