From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2013 02:21:30 +0000 (-0700)
Subject: Merge branch 'rj/sparse'
X-Git-Tag: v1.8.4-rc0~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fc5894bc720596964f65f2f645752d4740dbb731?hp=cb1824657bd0b6d9b916a0394cc67a6c18a27226

Merge branch 'rj/sparse'

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

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;