luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'main'

Browse Source 
fix: about libproc.h and PROC_PIDLISTFD_SIZE

See merge request GNOME/glib!3687
This commit is contained in:
Philip Withnall 2023-11-06 14:46:52 +00:00
commit a766945766
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -21,8 +21,8 @@ variables:
# Default CI job setup; contrast with `.only-origin`. # Default CI job setup; contrast with `.only-origin`.
# #
# Don’t execute the pipeline when a merge request is merged into `main`, as it # Don’t execute the pipeline when a merge request is merged into `origin/main`,
# will have already been tested # as it will have already been tested
.only-default: .only-default:
only: only:
- branches - branches
@ -30,7 +30,7 @@ variables:
refs: refs:
- tags - tags
variables: 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, # 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 # and don’t have much available resource. Limit those jobs to only ones on the

4
glib/gspawn.c
View File

@ -70,7 +70,7 @@
#include "glibintl.h" #include "glibintl.h"
#include "glib-unix.h" #include "glib-unix.h"
#ifdef __APPLE__ #if defined(__APPLE__) && defined(HAVE_LIBPROC_H)
#include <libproc.h> #include <libproc.h>
#include <sys/proc_info.h> #include <sys/proc_info.h>
#endif #endif
@ -1534,7 +1534,7 @@ safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data)
if (open_max < 0) if (open_max < 0)
open_max = 4096; 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 /* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation
* in the darwin tree here: * in the darwin tree here:
* *

1
meson.build
View File

@ -363,6 +363,7 @@ headers = [
'fstab.h', 'fstab.h',
'grp.h', 'grp.h',
'inttypes.h', 'inttypes.h',
'libproc.h',
'limits.h', 'limits.h',
'locale.h', 'locale.h',
'mach/mach_time.h', 'mach/mach_time.h',