Rebase against 876742bf2bf23765cd8a845a20b297cdf7803c67.

This commit is contained in:
Alistair Leslie-Hughes
2023-01-26 10:07:12 +11:00
parent 5fe0566802
commit fc3f586bd4
4 changed files with 14 additions and 52 deletions

View File

@ -1,4 +1,4 @@
From 3069c254173b551cde229830af857fc5e3abd911 Mon Sep 17 00:00:00 2001
From d3262875b2ce7d2a6746f2139ca00e3d0f13fb33 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().
@ -12,10 +12,10 @@ Although perhaps we shouldn't since the server doesn't do this.
2 files changed, 17 insertions(+)
diff --git a/configure.ac b/configure.ac
index f4e454ae217..de28e5228e9 100644
index 3be31e40cf6..0a2cdc0dfcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,7 @@ AC_CHECK_HEADERS(\
@@ -453,6 +453,7 @@ AC_CHECK_HEADERS(\
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@ -23,7 +23,7 @@ index f4e454ae217..de28e5228e9 100644
sys/extattr.h \
sys/filio.h \
sys/ipc.h \
@@ -2044,6 +2045,7 @@ AC_CHECK_FUNCS(\
@@ -2024,6 +2025,7 @@ AC_CHECK_FUNCS(\
port_create \
posix_fadvise \
posix_fallocate \
@ -31,7 +31,7 @@ index f4e454ae217..de28e5228e9 100644
prctl \
proc_pidinfo \
sched_yield \
@@ -2085,6 +2087,12 @@ case $host_os in
@@ -2049,6 +2051,12 @@ case $host_os in
;;
esac
@ -45,10 +45,10 @@ index f4e454ae217..de28e5228e9 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 509dd2869bf..d6b19f96a9c 100644
index fe2fc36a914..8e8c57d711c 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -335,6 +335,9 @@
@@ -309,6 +309,9 @@
/* Define to 1 if you have the `posix_fallocate' function. */
#undef HAVE_POSIX_FALLOCATE
@ -58,17 +58,17 @@ index 509dd2869bf..d6b19f96a9c 100644
/* Define to 1 if you have the `prctl' function. */
#undef HAVE_PRCTL
@@ -404,6 +407,9 @@
@@ -375,6 +378,9 @@
/* 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 you have the `shm_open' function. */
+#undef HAVE_SHM_OPEN
+
/* Define if sigaddset is supported */
#undef HAVE_SIGADDSET
/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
#undef HAVE_SIGINFO_T_SI_FD
@@ -553,6 +559,9 @@
@@ -510,6 +516,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H
@ -79,5 +79,5 @@ index 509dd2869bf..d6b19f96a9c 100644
#undef HAVE_SYS_EVENT_H
--
2.38.1
2.39.0