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 8b9f1e12841298591387e2b7590191610a37986e.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From f8f619802b42448514fdab786a2c593658c33625 Mon Sep 17 00:00:00 2001
|
||||
From 33486bf9924ffb152e008ec662e2f9905d67c449 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().
|
||||
@@ -13,7 +13,7 @@ Although perhaps we shouldn't since the server doesn't do this.
|
||||
3 files changed, 89 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index c9418c0f225..65a20ef25c8 100755
|
||||
index f2319159834..a3916efab32 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -7543,6 +7543,7 @@ for ac_header in \
|
||||
@@ -24,15 +24,15 @@ index c9418c0f225..65a20ef25c8 100755
|
||||
sys/filio.h \
|
||||
sys/ioctl.h \
|
||||
sys/ipc.h \
|
||||
@@ -18011,6 +18012,7 @@ for ac_func in \
|
||||
@@ -18009,6 +18010,7 @@ for ac_func in \
|
||||
poll \
|
||||
port_create \
|
||||
posix_fadvise \
|
||||
+ ppoll \
|
||||
prctl \
|
||||
pread \
|
||||
proc_pidinfo \
|
||||
@@ -18411,6 +18413,72 @@ fi
|
||||
readlink \
|
||||
@@ -18402,6 +18404,72 @@ fi
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -106,10 +106,10 @@ index c9418c0f225..65a20ef25c8 100755
|
||||
then
|
||||
if ${LDAP_CFLAGS:+false} :; then :
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a7c3be91b7e..0845cc83554 100644
|
||||
index 73869723bd3..6cab92efd74 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\
|
||||
@@ -510,6 +510,7 @@ AC_CHECK_HEADERS(\
|
||||
sys/cdio.h \
|
||||
sys/epoll.h \
|
||||
sys/event.h \
|
||||
@@ -117,15 +117,15 @@ index a7c3be91b7e..0845cc83554 100644
|
||||
sys/filio.h \
|
||||
sys/ioctl.h \
|
||||
sys/ipc.h \
|
||||
@@ -2216,6 +2217,7 @@ AC_CHECK_FUNCS(\
|
||||
@@ -2212,6 +2213,7 @@ AC_CHECK_FUNCS(\
|
||||
poll \
|
||||
port_create \
|
||||
posix_fadvise \
|
||||
+ ppoll \
|
||||
prctl \
|
||||
pread \
|
||||
proc_pidinfo \
|
||||
@@ -2272,6 +2274,16 @@ case $host_os in
|
||||
readlink \
|
||||
@@ -2262,6 +2264,16 @@ case $host_os in
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -143,10 +143,10 @@ index a7c3be91b7e..0845cc83554 100644
|
||||
if test "x$with_ldap" != "xno"
|
||||
then
|
||||
diff --git a/include/config.h.in b/include/config.h.in
|
||||
index 2b488894a49..1b3ab9f9580 100644
|
||||
index 9f8e7f34ada..5ecf57cde58 100644
|
||||
--- a/include/config.h.in
|
||||
+++ b/include/config.h.in
|
||||
@@ -516,6 +516,9 @@
|
||||
@@ -507,6 +507,9 @@
|
||||
/* Define to 1 if you have the `posix_fadvise' function. */
|
||||
#undef HAVE_POSIX_FADVISE
|
||||
|
||||
@@ -156,7 +156,7 @@ index 2b488894a49..1b3ab9f9580 100644
|
||||
/* Define to 1 if you have the `prctl' function. */
|
||||
#undef HAVE_PRCTL
|
||||
|
||||
@@ -600,6 +603,9 @@
|
||||
@@ -585,6 +588,9 @@
|
||||
/* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
|
||||
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
|
||||
|
||||
@@ -166,7 +166,7 @@ index 2b488894a49..1b3ab9f9580 100644
|
||||
/* Define if sigaddset is supported */
|
||||
#undef HAVE_SIGADDSET
|
||||
|
||||
@@ -767,6 +773,9 @@
|
||||
@@ -749,6 +755,9 @@
|
||||
/* Define to 1 if you have the <sys/epoll.h> header file. */
|
||||
#undef HAVE_SYS_EPOLL_H
|
||||
|
||||
@@ -177,5 +177,5 @@ index 2b488894a49..1b3ab9f9580 100644
|
||||
#undef HAVE_SYS_EVENT_H
|
||||
|
||||
--
|
||||
2.32.0
|
||||
2.33.0
|
||||
|
||||
|
Reference in New Issue
Block a user