XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: use winsock2.h definitions on mingw in xserver_poll.h

Browse Source 
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>
This commit is contained in:
Alan Coopersmith
2026-03-14 16:52:25 -07:00
parent 2cad349818
commit 16ea45e931
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
os/xserver_poll.h
View File

@@ -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;