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 ede9408bbd14880b3534110586562c2e6df8b07b..e83195bde5ce202bd20b1d1a5dc95fa3f54ed6a1 100644 (file)
--- 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 8217d97787b2ba38a5327c1204797044b2b4cd72..d340b6a1b6c4ecb8132e81fe306883aa18feb090 100644 (file)
--- 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 8bac9d990381f5664333a92f68b0b8cd97d43855..fb7a1a625abf07b0d896a270286ee422a700c14c 100644 (file)
--- 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.