From: Benoit Sigoure <tsunanet@gmail.com>
Date: Sun, 21 Jul 2013 19:54:08 +0000 (-0700)
Subject: Revert "compat/unsetenv.c: Fix a sparse warning"
X-Git-Tag: v1.8.4-rc0~5^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1e2a48d18a458d0431df8fef041bee857adb860?ds=inline;hp=--cc

Revert "compat/unsetenv.c: Fix a sparse warning"

This reverts commit ec535cc27e6c4f5e0b1d157e04f5511f166ecd9d.

POSIX explicitly states "the [environ] variable, which
must be declared by the user if it is to be used directly".
Not declaring it causes compilation to fail on OS X.

Instead don't declare the variable on MinGW, as it causes
a spurious warning there.

Signed-off-by: Benoit Sigoure <tsunanet@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

f1e2a48d18a458d0431df8fef041bee857adb860
diff --git a/compat/unsetenv.c b/compat/unsetenv.c
index 4ea18569c2..bf5fd7063b 100644
--- a/compat/unsetenv.c
+++ b/compat/unsetenv.c
@@ -2,6 +2,9 @@
 
 void gitunsetenv (const char *name)
 {
+#if !defined(__MINGW32__)
+     extern char **environ;
+#endif
      int src, dst;
      size_t nmln;