Merge branch 'wk/submodule-on-branch'

diff --git a/compat/unsetenv.c b/compat/unsetenv.c
index 4ea18569c240900b0e889873ddc782614c7724a6..bf5fd7063bc98964382b193cc9171a734c7aa790 100644 (file)
--- 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;