From 48acc0cb9911f00ce17eb0fbd4c3b500809d89df Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Tue, 16 Apr 2024 00:26:33 +0800 Subject: [PATCH 06/13] Fix environ define --- modules/misc/inhibit/xdg.c | 7 ++++++- modules/stream_filter/decomp.c | 7 ++++++- src/posix/netconf.c | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git modules/misc/inhibit/xdg.c modules/misc/inhibit/xdg.c index b2fe26947e..598bf0b462 100644 --- modules/misc/inhibit/xdg.c +++ modules/misc/inhibit/xdg.c @@ -48,7 +48,12 @@ struct vlc_inhibit_sys posix_spawnattr_t attr; }; -extern char **environ; +#ifdef __APPLE__ + #include + #define environ (*_NSGetEnviron()) +#else + extern char **environ; +#endif static void Timer (void *data) { diff --git modules/stream_filter/decomp.c modules/stream_filter/decomp.c index b253c02219..b1328538bc 100644 --- modules/stream_filter/decomp.c +++ modules/stream_filter/decomp.c @@ -92,7 +92,12 @@ struct stream_sys_t int64_t pts_delay; }; -extern char **environ; +#ifdef __APPLE__ + #include + #define environ (*_NSGetEnviron()) +#else + extern char **environ; +#endif static const size_t bufsize = 65536; #ifdef HAVE_VMSPLICE diff --git src/posix/netconf.c src/posix/netconf.c index e2db67b386..efbf3a841e 100644 --- src/posix/netconf.c +++ src/posix/netconf.c @@ -32,7 +32,12 @@ #include #include -extern char **environ; +#ifdef __APPLE__ + #include + #define environ (*_NSGetEnviron()) +#else + extern char **environ; +#endif #include #include