From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Tue, 13 Nov 2007 20:05:01 +0000 (+0100)
Subject: Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
X-Git-Tag: v1.5.4-rc0~154^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=80bbe72b76ab91628b493b55ed74f6eec8432fed;p=git.git

Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.

... since all system headers are pulled in via git-compat-util.h

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-compat-util.h b/git-compat-util.h
index ede9408bb..e83195bde 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -52,6 +52,8 @@
 #include <fnmatch.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
 #include <assert.h>
 #include <regex.h>
 #include <netinet/in.h>
diff --git a/help.c b/help.c
index 8217d9778..d340b6a1b 100644
--- a/help.c
+++ b/help.c
@@ -7,7 +7,6 @@
 #include "builtin.h"
 #include "exec_cmd.h"
 #include "common-cmds.h"
-#include <sys/ioctl.h>
 
 /* most GUI terminals set COLUMNS (although some don't export it) */
 static int term_columns(void)
diff --git a/pager.c b/pager.c
index 8bac9d990..fb7a1a625 100644
--- a/pager.c
+++ b/pager.c
@@ -1,7 +1,5 @@
 #include "cache.h"
 
-#include <sys/select.h>
-
 /*
  * This is split up from the rest of git so that we might do
  * something different on Windows, for example.