summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-19 22:34:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-20 17:51:35 (GMT)
commit85023577a8f4b540aa64aa37f6f44578c0c305a3 (patch)
tree52bd684220373101748992325bdbe67e5aa573c6 /merge-index.c
parent6d2fa7f1b489c65e677c18eda5c144dbc5d614ab (diff)
downloadgit-85023577a8f4b540aa64aa37f6f44578c0c305a3.zip
git-85023577a8f4b540aa64aa37f6f44578c0c305a3.tar.gz
git-85023577a8f4b540aa64aa37f6f44578c0c305a3.tar.bz2
simplify inclusion of system header files.
This is a mechanical clean-up of the way *.c files include system header files. (1) sources under compat/, platform sha-1 implementations, and xdelta code are exempt from the following rules; (2) the first #include must be "git-compat-util.h" or one of our own header file that includes it first (e.g. config.h, builtin.h, pkt-line.h); (3) system headers that are included in "git-compat-util.h" need not be included in individual C source files. (4) "git-compat-util.h" does not have to include subsystem specific header files (e.g. expat.h). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/merge-index.c b/merge-index.c
index 646d090..a9983dd 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,7 +1,3 @@
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-
#include "cache.h"
static const char *pgm;