mirror of
https://github.com/RGBCube/serenity
synced 2025-10-31 05:22:45 +00:00
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kenneth Myhra <kennethmyhra@gmail.com>
|
|
Date: Thu, 12 Aug 2021 20:29:32 +0200
|
|
Subject: [PATCH] 'poll.h' is located at root, not 'sys/poll.h'
|
|
|
|
---
|
|
meson.build | 18 ++++++++++++++----
|
|
1 file changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index a330b7b..0034898 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -1758,7 +1758,11 @@ g_have_gnuc_varargs = cc.compiles('''
|
|
if cc.has_header('alloca.h')
|
|
glibconfig_conf.set('GLIB_HAVE_ALLOCA_H', true)
|
|
endif
|
|
-has_syspoll = cc.has_header('sys/poll.h')
|
|
+if host_system == 'serenity'
|
|
+ has_syspoll = cc.has_header('poll.h')
|
|
+else
|
|
+ has_syspoll = cc.has_header('sys/poll.h')
|
|
+endif
|
|
has_systypes = cc.has_header('sys/types.h')
|
|
if has_syspoll
|
|
glibconfig_conf.set('GLIB_HAVE_SYS_POLL_H', true)
|
|
@@ -1766,9 +1770,15 @@ endif
|
|
has_winsock2 = cc.has_header('winsock2.h')
|
|
|
|
if has_syspoll and has_systypes
|
|
- poll_includes = '''
|
|
- #include<sys/poll.h>
|
|
- #include<sys/types.h>'''
|
|
+ if host_system == 'serenity'
|
|
+ poll_includes = '''
|
|
+ #include<poll.h>
|
|
+ #include<sys/types.h>'''
|
|
+ else
|
|
+ poll_includes = '''
|
|
+ #include<sys/poll.h>
|
|
+ #include<sys/types.h>'''
|
|
+ endif
|
|
elif has_winsock2
|
|
poll_includes = '''
|
|
#define _WIN32_WINNT @0@
|