summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-08-09 15:18:19 -0700
committerJunio C Hamano <gitster@pobox.com>2019-08-09 15:18:19 -0700
commit5d929ecbcb883f625134b0999476f86e0e85eee4 (patch)
treecf701177fde979159deea78c65f6ff0c3c83e7ec
parentMerge branch 'jk/no-system-includes-in-dot-c' into maint (diff)
parentxdiff: remove duplicate headers from xpatience.c (diff)
downloadgit-5d929ecbcb883f625134b0999476f86e0e85eee4.tar.xz
git-5d929ecbcb883f625134b0999476f86e0e85eee4.zip
Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint
Compilation fix. * cb/xdiff-no-system-includes-in-dot-c: xdiff: remove duplicate headers from xpatience.c xdiff: remove duplicate headers from xhistogram.c xdiff: drop system includes in xutils.c
-rw-r--r--xdiff/xhistogram.c2
-rw-r--r--xdiff/xpatience.c2
-rw-r--r--xdiff/xutils.c4
3 files changed, 0 insertions, 8 deletions
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index ec85f5992bd..c7b35a9667f 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -42,8 +42,6 @@
*/
#include "xinclude.h"
-#include "xtypes.h"
-#include "xdiff.h"
#define MAX_PTR UINT_MAX
#define MAX_CNT UINT_MAX
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index f3573d9f00e..3c5601b602a 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -20,8 +20,6 @@
*
*/
#include "xinclude.h"
-#include "xtypes.h"
-#include "xdiff.h"
/*
* The basic idea of patience diff is to find lines that are unique in
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 963e1c58b90..cfa6e2220ff 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -20,13 +20,9 @@
*
*/
-#include <limits.h>
-#include <assert.h>
#include "xinclude.h"
-
-
long xdl_bogosqrt(long n) {
long i;