Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

gitster · gitster · commit 5d929ecbcb88 · 2019-08-09T15:18:19.000-07:00
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
diff --git 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
@@ -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
@@ -20,13 +20,9 @@
  *
  */
 
-#include <limits.h>
-#include <assert.h>
 #include "xinclude.h"
 
 
-
-
 long xdl_bogosqrt(long n) {
 	long i;
 

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`*`
`21`	`21`	`*/`
`22`	`22`	`#include "xinclude.h"`
`23`		`-#include "xtypes.h"`
`24`		`-#include "xdiff.h"`
`25`	`23`
`26`	`24`	`/*`
`27`	`25`	`* The basic idea of patience diff is to find lines that are unique in`