[Xfce4-commits] r29341 - in xfce4-panel/trunk: . plugins/launcher

[Nick Schermer]

Author: nick
Date: 2009-01-25 12:44:38 +0000 (Sun, 25 Jan 2009)
New Revision: 29341

Modified:
   xfce4-panel/trunk/NEWS
   xfce4-panel/trunk/plugins/launcher/launcher-exec.c
Log:
Fixed extern char** environ is not defined on BSD platforms (bug #4834).


Modified: xfce4-panel/trunk/NEWS
===================================================================
--- xfce4-panel/trunk/NEWS	2009-01-25 12:12:31 UTC (rev 29340)
+++ xfce4-panel/trunk/NEWS	2009-01-25 12:44:38 UTC (rev 29341)
@@ -1,3 +1,7 @@
+x.x.xx
+======
+- Fixed extern char** environ is not defined on BSD platforms (bug #4834).
+
 4.5.93
 ======
 - Cache tooltip icons. Since gtk queries it a lot, resulting in too many

Modified: xfce4-panel/trunk/plugins/launcher/launcher-exec.c
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher-exec.c	2009-01-25 12:12:31 UTC (rev 29340)
+++ xfce4-panel/trunk/plugins/launcher/launcher-exec.c	2009-01-25 12:44:38 UTC (rev 29341)
@@ -63,8 +63,18 @@
 #include <libsn/sn.h>
 #endif
 
+#ifdef __APPLE__
+/* apple doesn't have a environ symbol */
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#elif !defined(__USE_GNU)
+/* when __USE_GNU is defined environ is defined in unistd.h
+ * this to avoid a redundant redeclaration */
+extern gchar **environ;
+#endif
 
 
+
 #ifdef HAVE_LIBSTARTUP_NOTIFICATION
 typedef struct
 {