From 911808f4dcd0d75c22d6e5592d0a8e96815af992 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Mon, 25 Jun 2012 16:13:59 +0200
Subject: [PATCH] compat/terminal: header-fixup

getch is declared in conio.h, which was only included from
compat/mingw.c and compat/msvc.c.

Fix this, by moving the inclusion of getch to git-compat-util.h
instead.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
 compat/mingw.c    | 1 -
 compat/msvc.c     | 1 -
 git-compat-util.h | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index ecbfa6e597..1eb974fcc9 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1,6 +1,5 @@
 #include "../git-compat-util.h"
 #include "win32.h"
-#include <conio.h>
 #include <wchar.h>
 #include "../strbuf.h"
 #include "../run-command.h"
diff --git a/compat/msvc.c b/compat/msvc.c
index 71843d7eef..a3a4e0e952 100644
--- a/compat/msvc.c
+++ b/compat/msvc.c
@@ -1,6 +1,5 @@
 #include "../git-compat-util.h"
 #include "win32.h"
-#include <conio.h>
 #include "../strbuf.h"
 
 #include "mingw.c"
diff --git a/git-compat-util.h b/git-compat-util.h
index e6f12cc458..6429352c8d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -90,6 +90,7 @@
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>
 #include <windows.h>
+#include <conio.h>
 #endif
 
 #include <unistd.h>
-- 
2.11.4.GIT