summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-31 21:38:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-31 21:38:56 (GMT)
commitd163b6ae6b6e670494f8547a29eea3ad1e477e82 (patch)
tree6bd52af4f25225f867e3e7611abdcb107ed42396 /xdiff
parent0bdce88004b768a0d12f64de0b71946c444f616c (diff)
parent81ed2b405cc6eca56fa4ab8eb1fb3efb839e353c (diff)
downloadgit-d163b6ae6b6e670494f8547a29eea3ad1e477e82.zip
git-d163b6ae6b6e670494f8547a29eea3ad1e477e82.tar.gz
git-d163b6ae6b6e670494f8547a29eea3ad1e477e82.tar.bz2
Merge branch 'cb/xdiff-no-system-includes-in-dot-c'
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
Diffstat (limited to 'xdiff')
-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 ec85f59..c7b35a9 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 f3573d9..3c5601b 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 963e1c5..cfa6e22 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;