From 99ed5920da3b1dc17b911e63e28b08b5b40495e7 Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Sun, 15 Jan 2012 00:19:31 +0100
Subject: [PATCH] Revert "mingw.c: move definition of mingw_getenv down"

This reverts commit 06bc4b796ad69ba93f0a8c451368602e0553c2d3.

Signed-off-by: Karsten Blees <blees@dcon.de>
---
 compat/mingw.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 17ed1f7ad5..e1f7a3b0b5 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -180,7 +180,7 @@ static int ask_yes_no_if_possible(const char *format, ...)
 	vsnprintf(question, sizeof(question), format, args);
 	va_end(args);
 
-	if ((retry_hook[0] = mingw_getenv("GIT_ASK_YESNO"))) {
+	if ((retry_hook[0] = getenv("GIT_ASK_YESNO"))) {
 		retry_hook[1] = question;
 		return !run_command_v_opt(retry_hook, 0);
 	}
@@ -665,6 +665,23 @@ char *mingw_getcwd(char *pointer, int len)
 	return ret;
 }
 
+#undef getenv
+char *mingw_getenv(const char *name)
+{
+	char *result = getenv(name);
+	if (!result && !strcmp(name, "TMPDIR")) {
+		/* on Windows it is TMP and TEMP */
+		result = getenv("TMP");
+		if (!result)
+			result = getenv("TEMP");
+	}
+	else if (!result && !strcmp(name, "TERM")) {
+		/* simulate TERM to enable auto-color (see color.c) */
+		result = "winansi";
+	}
+	return result;
+}
+
 /*
  * See http://msdn2.microsoft.com/en-us/library/17w5ykft(vs.71).aspx
  * (Parsing C++ Command-Line Arguments)
@@ -764,7 +781,7 @@ static const char *parse_interpreter(const char *cmd)
  */
 static char **get_path_split(void)
 {
-	char *p, **path, *envpath = mingw_getenv("PATH");
+	char *p, **path, *envpath = getenv("PATH");
 	int i, n = 0;
 
 	if (!envpath || !*envpath)
@@ -1183,23 +1200,6 @@ char **make_augmented_environ(const char *const *vars)
 	return env;
 }
 
-#undef getenv
-char *mingw_getenv(const char *name)
-{
-	char *result = getenv(name);
-	if (!result && !strcmp(name, "TMPDIR")) {
-		/* on Windows it is TMP and TEMP */
-		result = getenv("TMP");
-		if (!result)
-			result = getenv("TEMP");
-	}
-	else if (!result && !strcmp(name, "TERM")) {
-		/* simulate TERM to enable auto-color (see color.c) */
-		result = "winansi";
-	}
-	return result;
-}
-
 /*
  * Note, this isn't a complete replacement for getaddrinfo. It assumes
  * that service contains a numerical port, or that it is null. It
-- 
2.11.4.GIT