summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-11-13 21:05:01 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-14 15:18:39 -0800
commit80bbe72b76ab91628b493b55ed74f6eec8432fed (patch)
treea472d6e5e29ae28fb29a51a8115013df8d3ade9b
parent85dadc389468211a2fc0006ce8ea524490d417f5 (diff)
downloadgit-80bbe72b76ab91628b493b55ed74f6eec8432fed.tar.gz
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>
-rw-r--r--git-compat-util.h2
-rw-r--r--help.c1
-rw-r--r--pager.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index ede9408bbd..e83195bde5 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 8217d97787..d340b6a1b6 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 8bac9d9903..fb7a1a625a 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.