Declare environ if the system does not do so

The environ variable is supposed to be defined by the code using it, but
on glibc-based systems it will get defined if we request it, by including
<unistd.h> and defining _GNU_SOURCE.

diff --git a/configure.ac b/configure.ac
index 17978b18c07078587346894963f361514b43575e..4a3c8b00cc3e351c847bc4687cdfcc5d97448d02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,10 @@ AC_CHECK_DECL([F_CLOSEM], [
 #include <fcntl.h>
 ]])
 
+AC_CHECK_DECLS([environ], [], [], [[
+#include <unistd.h>
+]])
+
 AC_CACHE_CHECK([for GNU .init_array section support],
   [libbsd_cv_gnu_init_array_support], [
   AC_RUN_IFELSE([

diff --git a/src/setproctitle.c b/src/setproctitle.c
index d3e10876d42e588d9f99f96421dbf05e27185ce9..64ff92a96c0e89edb0dc4a5d19e060ef13420bfd 100644 (file)
--- a/src/setproctitle.c
+++ b/src/setproctitle.c
@@ -33,6 +33,10 @@
 #include <string.h>
 #include "local-link.h"
 
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif
+
 static struct {
        /* Original value. */
        const char *arg0;