summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorBenoit Sigoure <tsunanet@gmail.com>2013-07-21 12:54:08 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-21 15:09:56 -0700
commitf1e2a48d18a458d0431df8fef041bee857adb860 (patch)
tree5643669f227b1633794851c20fa73515a8957eb2 /compat
parent84d32bf7678259c08406571cd6ce4b7a6724dcba (diff)
downloadgit-f1e2a48d18a458d0431df8fef041bee857adb860.tar.gz
Revert "compat/unsetenv.c: Fix a sparse warning"rj/sparse
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>
Diffstat (limited to 'compat')
-rw-r--r--compat/unsetenv.c3
1 files changed, 3 insertions, 0 deletions
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;