Rebase against ee5bd3bab82903b26e360d077c93af4a26158367.

This commit is contained in:
Alistair Leslie-Hughes
2024-09-11 09:57:51 +10:00
parent 27b121f293
commit d7706d345c
4 changed files with 50 additions and 46 deletions

View File

@ -1,4 +1,4 @@
From 3b9e832890ad710eecf08f7901d708cfebb3520c Mon Sep 17 00:00:00 2001
From ff79cf149df18ecb2fe60e776673c6d428a13ae8 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 | 8 ++++++++
include/config.h.in | 9 +++++++++
2 files changed, 17 insertions(+)
configure.ac | 8 ++++++++
include/config.h.in | 11 ++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4314be5553c..920d8343925 100644
index 52612934197..7a1b92a15d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -407,6 +407,7 @@ AC_CHECK_HEADERS(\
@@ -408,6 +408,7 @@ AC_CHECK_HEADERS(\
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@ -23,7 +23,7 @@ index 4314be5553c..920d8343925 100644
sys/extattr.h \
sys/filio.h \
sys/ipc.h \
@@ -2076,6 +2077,7 @@ AC_CHECK_FUNCS(\
@@ -2096,6 +2097,7 @@ AC_CHECK_FUNCS(\
port_create \
posix_fadvise \
posix_fallocate \
@ -31,7 +31,7 @@ index 4314be5553c..920d8343925 100644
prctl \
sched_yield \
renameat \
@@ -2100,6 +2102,12 @@ case $host_os in
@@ -2120,6 +2122,12 @@ case $host_os in
;;
esac
@ -45,30 +45,32 @@ index 4314be5553c..920d8343925 100644
AC_LINK_IFELSE([AC_LANG_PROGRAM(
[[#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no]))
diff --git a/include/config.h.in b/include/config.h.in
index 096ecdf94ec..303fb7f2b69 100644
index a09cea2c8ee..8ab002c0030 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -312,6 +312,9 @@
/* Define to 1 if you have the `posix_fallocate' function. */
@@ -321,6 +321,9 @@
/* Define to 1 if you have the 'posix_fallocate' function. */
#undef HAVE_POSIX_FALLOCATE
+/* Define to 1 if you have the `ppoll' function. */
+#undef HAVE_PPOLL
+
/* Define to 1 if you have the `prctl' function. */
/* Define to 1 if you have the 'prctl' function. */
#undef HAVE_PRCTL
@@ -369,6 +372,9 @@
/* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
@@ -378,7 +381,10 @@
/* Define to 1 if 'interface_id' is a member of 'sg_io_hdr_t'. */
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
-/* Define to 1 if 'si_fd' is a member of 'siginfo_t'. */
+/* Define to 1 if you have the `shm_open' function. */
+#undef HAVE_SHM_OPEN
+
/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
+/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
#undef HAVE_SIGINFO_T_SI_FD
@@ -498,6 +504,9 @@
/* Define to 1 if you have the 'sigprocmask' function. */
@@ -507,6 +513,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H