Rebase against 7037201214729c25d2439818012c156a3991cdb7.

This commit is contained in:
Alistair Leslie-Hughes
2024-09-20 07:43:46 +10:00
parent e68e4dbb75
commit f09458658e
3 changed files with 32 additions and 32 deletions

View File

@ -1,4 +1,4 @@
From ff79cf149df18ecb2fe60e776673c6d428a13ae8 Mon Sep 17 00:00:00 2001
From 6dbedd8d7aebe117b013c61f9549848f13619f0e 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, 18 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 52612934197..7a1b92a15d6 100644
index 67775f9cd15..c03d4c3688b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,6 +408,7 @@ AC_CHECK_HEADERS(\
@@ -407,6 +407,7 @@ AC_CHECK_HEADERS(\
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@ -23,7 +23,7 @@ index 52612934197..7a1b92a15d6 100644
sys/extattr.h \
sys/filio.h \
sys/ipc.h \
@@ -2096,6 +2097,7 @@ AC_CHECK_FUNCS(\
@@ -2067,6 +2068,7 @@ AC_CHECK_FUNCS(\
port_create \
posix_fadvise \
posix_fallocate \
@ -31,9 +31,9 @@ index 52612934197..7a1b92a15d6 100644
prctl \
sched_yield \
renameat \
@@ -2120,6 +2122,12 @@ case $host_os in
;;
esac
@@ -2087,6 +2089,12 @@ AC_SEARCH_LIBS(clock_gettime, rt,
test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
LIBS=$ac_save_LIBS
+ac_save_LIBS=$LIBS
+AC_SEARCH_LIBS(shm_open, rt,
@ -45,10 +45,10 @@ index 52612934197..7a1b92a15d6 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 a09cea2c8ee..8ab002c0030 100644
index 1c3d4c4d62b..e9686e04a2a 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -321,6 +321,9 @@
@@ -318,6 +318,9 @@
/* Define to 1 if you have the 'posix_fallocate' function. */
#undef HAVE_POSIX_FALLOCATE
@ -58,7 +58,7 @@ index a09cea2c8ee..8ab002c0030 100644
/* Define to 1 if you have the 'prctl' function. */
#undef HAVE_PRCTL
@@ -378,7 +381,10 @@
@@ -375,7 +378,10 @@
/* Define to 1 if 'interface_id' is a member of 'sg_io_hdr_t'. */
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
@ -70,7 +70,7 @@ index a09cea2c8ee..8ab002c0030 100644
#undef HAVE_SIGINFO_T_SI_FD
/* Define to 1 if you have the 'sigprocmask' function. */
@@ -507,6 +513,9 @@
@@ -504,6 +510,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H