mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
fix: about libproc.h and PROC_PIDLISTFD_SIZE
This commit is contained in:
parent
534edd070d
commit
7b80f73d29
@ -21,8 +21,8 @@ variables:
|
||||
|
||||
# Default CI job setup; contrast with `.only-origin`.
|
||||
#
|
||||
# Don’t execute the pipeline when a merge request is merged into `main`, as it
|
||||
# will have already been tested
|
||||
# Don’t execute the pipeline when a merge request is merged into `origin/main`,
|
||||
# as it will have already been tested
|
||||
.only-default:
|
||||
only:
|
||||
- branches
|
||||
@ -30,7 +30,7 @@ variables:
|
||||
refs:
|
||||
- tags
|
||||
variables:
|
||||
- $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
- $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "GNOME"
|
||||
|
||||
# Some jobs run on CI runners which don’t have good isolation between CI jobs,
|
||||
# and don’t have much available resource. Limit those jobs to only ones on the
|
||||
|
@ -70,7 +70,7 @@
|
||||
#include "glibintl.h"
|
||||
#include "glib-unix.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#if defined(__APPLE__) && defined(HAVE_LIBPROC_H)
|
||||
#include <libproc.h>
|
||||
#include <sys/proc_info.h>
|
||||
#endif
|
||||
@ -1534,7 +1534,7 @@ safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data)
|
||||
if (open_max < 0)
|
||||
open_max = 4096;
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#if defined(__APPLE__) && defined(HAVE_LIBPROC_H)
|
||||
/* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation
|
||||
* in the darwin tree here:
|
||||
*
|
||||
|
@ -363,6 +363,7 @@ headers = [
|
||||
'fstab.h',
|
||||
'grp.h',
|
||||
'inttypes.h',
|
||||
'libproc.h',
|
||||
'limits.h',
|
||||
'locale.h',
|
||||
'mach/mach_time.h',
|
||||
|
Loading…
Reference in New Issue
Block a user