Merge branch 'jc/count' into next

diff --git a/compat/mmap.c b/compat/mmap.c
index a051c4767dfad8d8083051fe18aa9cfdba83b5f9..55cb120764da5520da7dbd91193a285551eae8bb 100644 (file)
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include "../cache.h"
+#include "../git-compat-util.h"
 
 void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset)
 {