You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From d6b29a6153e786ff7a79bdbb7c33977e19c6e267 Mon Sep 17 00:00:00 2001
|
||||
From 2cee55344dd3bef2ed548d2dff275612021e8641 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Wed, 13 Jun 2018 10:44:49 -0500
|
||||
Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
|
||||
@@ -7,15 +7,15 @@ We use ppoll() instead of poll() for the better time granularity.
|
||||
|
||||
Although perhaps we shouldn't since the server doesn't do this.
|
||||
---
|
||||
configure.ac | 12 ++++++++
|
||||
include/config.h.in | 9 ++++++
|
||||
3 files changed, 89 insertions(+)
|
||||
configure.ac | 12 ++++++++++++
|
||||
include/config.h.in | 9 +++++++++
|
||||
2 files changed, 21 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 718ab1ca50e..d5f82ad2af4 100644
|
||||
index 4d3c2fab566..2b26e892b08 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -496,6 +496,7 @@ AC_CHECK_HEADERS(\
|
||||
@@ -481,6 +481,7 @@ AC_CHECK_HEADERS(\
|
||||
sys/cdio.h \
|
||||
sys/epoll.h \
|
||||
sys/event.h \
|
||||
@@ -23,15 +23,15 @@ index 718ab1ca50e..d5f82ad2af4 100644
|
||||
sys/filio.h \
|
||||
sys/ioctl.h \
|
||||
sys/ipc.h \
|
||||
@@ -2158,6 +2159,7 @@ AC_CHECK_FUNCS(\
|
||||
@@ -1959,6 +1960,7 @@ AC_CHECK_FUNCS(\
|
||||
port_create \
|
||||
posix_fadvise \
|
||||
posix_fallocate \
|
||||
+ ppoll \
|
||||
prctl \
|
||||
proc_pidinfo \
|
||||
renameat \
|
||||
@@ -2199,6 +2201,16 @@ case $host_os in
|
||||
sched_yield \
|
||||
@@ -2001,6 +2003,16 @@ case $host_os in
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -49,10 +49,10 @@ index 718ab1ca50e..d5f82ad2af4 100644
|
||||
if test "x$with_ldap" != "xno"
|
||||
then
|
||||
diff --git a/include/config.h.in b/include/config.h.in
|
||||
index e975ca8a55d..a19789dad8c 100644
|
||||
index 0fe50e8ce7c..48dae80850d 100644
|
||||
--- a/include/config.h.in
|
||||
+++ b/include/config.h.in
|
||||
@@ -474,6 +474,9 @@
|
||||
@@ -398,6 +398,9 @@
|
||||
/* Define to 1 if you have the `posix_fallocate' function. */
|
||||
#undef HAVE_POSIX_FALLOCATE
|
||||
|
||||
@@ -62,7 +62,7 @@ index e975ca8a55d..a19789dad8c 100644
|
||||
/* Define to 1 if you have the `prctl' function. */
|
||||
#undef HAVE_PRCTL
|
||||
|
||||
@@ -546,6 +549,9 @@
|
||||
@@ -473,6 +476,9 @@
|
||||
/* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
|
||||
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
|
||||
|
||||
@@ -72,7 +72,7 @@ index e975ca8a55d..a19789dad8c 100644
|
||||
/* Define if sigaddset is supported */
|
||||
#undef HAVE_SIGADDSET
|
||||
|
||||
@@ -695,6 +701,9 @@
|
||||
@@ -625,6 +631,9 @@
|
||||
/* Define to 1 if you have the <sys/epoll.h> header file. */
|
||||
#undef HAVE_SYS_EPOLL_H
|
||||
|
||||
|
Reference in New Issue
Block a user