diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-19 14:34:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 09:51:35 -0800 |
| commit | 85023577a8f4b540aa64aa37f6f44578c0c305a3 (patch) | |
| tree | 52bd684220373101748992325bdbe67e5aa573c6 /merge-recursive.c | |
| parent | 6d2fa7f1b489c65e677c18eda5c144dbc5d614ab (diff) | |
| download | git-85023577a8f4b540aa64aa37f6f44578c0c305a3.tar.gz git-85023577a8f4b540aa64aa37f6f44578c0c305a3.tar.xz | |
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-recursive.c')
| -rw-r--r-- | merge-recursive.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6dd6e2e5a..1de273ea1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3,13 +3,6 @@ * Fredrik Kuivinen. * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ -#include <stdarg.h> -#include <string.h> -#include <assert.h> -#include <sys/wait.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <time.h> #include "cache.h" #include "cache-tree.h" #include "commit.h" |