mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 23:16:14 +01:00
Merge branch 'wip/lantw/gspawn-declare-environ' into 'master'
gspawn: Declare environ See merge request GNOME/glib!134
This commit is contained in:
commit
a65ee63c71
@ -32,6 +32,10 @@
|
||||
#include <dirent.h>
|
||||
#include <spawn.h>
|
||||
|
||||
#ifdef HAVE_CRT_EXTERNS_H
|
||||
#include <crt_externs.h> /* for _NSGetEnviron */
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif /* HAVE_SYS_SELECT_H */
|
||||
@ -71,6 +75,12 @@
|
||||
#endif /* __GLIBC__ */
|
||||
#endif /* HAVE_POSIX_SPAWN */
|
||||
|
||||
#ifdef HAVE__NSGETENVIRON
|
||||
#define environ (*_NSGetEnviron())
|
||||
#else
|
||||
extern char **environ;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* SECTION:spawn
|
||||
* @Short_description: process launching
|
||||
|
Loading…
Reference in New Issue
Block a user