From b6df4f7de49f0aa5fd513fbf85e9f400df7dd79b Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 3 Aug 2012 14:39:15 +0300 Subject: [PATCH] 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 --- clients/desktop-shell.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c index 082a30a0..97b20667 100644 --- a/clients/desktop-shell.c +++ b/clients/desktop-shell.c @@ -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;