mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop-shell: use the standard 'environ' variable 

The variable '__environ' seems to be libc implementation specific, and
not avaible on Android.

Use the POSIX standard variable 'environ', which also luckily happens to
be available on Android, which is not POSIX.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-08-03 14:39:15 +03:00 committed by Kristian Høgsberg
parent 168ed72dc7
commit b6df4f7de4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clients/desktop-shell.c
View File

@ -44,6 +44,8 @@
#include "desktop-shell-client-protocol.h"
extern char **environ; /* defined by libc */
struct desktop {
struct display *display;
struct desktop_shell *shell;
@ -484,9 +486,9 @@ panel_add_launcher(struct panel *panel, const char *icon, const char *path)
wl_array_init(&launcher->envp);
wl_array_init(&launcher->argv);
for (i = 0; __environ[i]; i++) {
for (i = 0; environ[i]; i++) {
ps = wl_array_add(&launcher->envp, sizeof *ps);
*ps = __environ[i];
*ps = environ[i];
}
j = 0;