mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-04-09 13:20:38 +02:00
16ea45e931
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>
59 lines
1.8 KiB
C
59 lines
1.8 KiB
C
/*
|
|
* Copyright © 2016 Keith Packard
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
* the above copyright notice appear in all copies and that both that copyright
|
|
* notice and this permission notice appear in supporting documentation, and
|
|
* that the name of the copyright holders not be used in advertising or
|
|
* publicity pertaining to distribution of the software without specific,
|
|
* written prior permission. The copyright holders make no representations
|
|
* about the suitability of this software for any purpose. It is provided "as
|
|
* is" without express or implied warranty.
|
|
*
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
|
* OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _XSERVER_POLL_H_
|
|
#define _XSERVER_POLL_H_
|
|
|
|
#ifndef _DIX_CONFIG_H_
|
|
#error must include dix-config.h to use xserver_poll.h
|
|
#endif
|
|
|
|
#ifdef HAVE_POLL
|
|
#include <poll.h>
|
|
#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
|
|
#define POLLERR 0x08
|
|
#define POLLHUP 0x10
|
|
#define POLLNVAL 0x20
|
|
|
|
struct pollfd
|
|
{
|
|
int fd;
|
|
short events;
|
|
short revents;
|
|
};
|
|
#endif
|
|
|
|
typedef unsigned long nfds_t;
|
|
|
|
int xserver_poll (struct pollfd *pArray, nfds_t n_fds, int timeout);
|
|
|
|
#endif
|
|
|
|
#endif /* _XSERVER_POLL_H_ */
|