Rebase against 623bc9fa54311d941d09760dc5300697ba11debe.

This commit is contained in:
Alistair Leslie-Hughes
2022-11-16 10:25:40 +11:00
parent 5088fc67ba
commit 8a5220955b
5 changed files with 38 additions and 38 deletions

View File

@@ -1,4 +1,4 @@
From f2fe168b2ca8099c7afd06873ec77daef2ddf243 Mon Sep 17 00:00:00 2001
From 3069c254173b551cde229830af857fc5e3abd911 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 fe6a773d1c3..3e8eaca6b7c 100644
index f4e454ae217..de28e5228e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,6 +467,7 @@ AC_CHECK_HEADERS(\
@@ -464,6 +464,7 @@ AC_CHECK_HEADERS(\
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@@ -23,7 +23,7 @@ index fe6a773d1c3..3e8eaca6b7c 100644
sys/extattr.h \
sys/filio.h \
sys/ipc.h \
@@ -2039,6 +2040,7 @@ AC_CHECK_FUNCS(\
@@ -2044,6 +2045,7 @@ AC_CHECK_FUNCS(\
port_create \
posix_fadvise \
posix_fallocate \
@@ -31,7 +31,7 @@ index fe6a773d1c3..3e8eaca6b7c 100644
prctl \
proc_pidinfo \
sched_yield \
@@ -2078,6 +2080,12 @@ case $host_os in
@@ -2085,6 +2087,12 @@ case $host_os in
;;
esac
@@ -41,14 +41,14 @@ index fe6a773d1c3..3e8eaca6b7c 100644
+ test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
+LIBS=$ac_save_LIBS
+
dnl **** Check for OpenLDAP ***
if test "x$with_ldap" != "xno"
then
AC_CACHE_CHECK([for sched_setaffinity],wine_cv_have_sched_setaffinity,
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 3a06d36bd02..b29582c6029 100644
index 509dd2869bf..d6b19f96a9c 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -344,6 +344,9 @@
@@ -335,6 +335,9 @@
/* Define to 1 if you have the `posix_fallocate' function. */
#undef HAVE_POSIX_FALLOCATE
@@ -58,7 +58,7 @@ index 3a06d36bd02..b29582c6029 100644
/* Define to 1 if you have the `prctl' function. */
#undef HAVE_PRCTL
@@ -416,6 +419,9 @@
@@ -404,6 +407,9 @@
/* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
@@ -68,7 +68,7 @@ index 3a06d36bd02..b29582c6029 100644
/* Define if sigaddset is supported */
#undef HAVE_SIGADDSET
@@ -565,6 +571,9 @@
@@ -553,6 +559,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H
@@ -79,5 +79,5 @@ index 3a06d36bd02..b29582c6029 100644
#undef HAVE_SYS_EVENT_H
--
2.35.1
2.38.1