Sync with maint

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