X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=diffcore-order.c;h=7ad09461858aa6832b828df411fd1b736f035465;hb=ee24ee55c28e46b502e4e2d219feced5a5d67e6b;hp=0bc2b22f848457a8e6ffafc6a1d9a26be677209f;hpb=9086a18cb81f99fff943b36830396ac8c37c7e9f;p=git.git

diff --git a/diffcore-order.c b/diffcore-order.c
index 0bc2b22f8..7ad094618 100644
--- a/diffcore-order.c
+++ b/diffcore-order.c
@@ -4,7 +4,6 @@
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
-#include <fnmatch.h>
 
 static char **order;
 static int order_cnt;
@@ -30,7 +29,7 @@ static void prepare_order(const char *orderfile)
 	close(fd);
 	if (map == MAP_FAILED)
 		return;
-	endp = map + st.st_size;
+	endp = (char *) map + st.st_size;
 	for (pass = 0; pass < 2; pass++) {
 		cnt = 0;
 		cp = map;