summaryrefslogtreecommitdiff
path: root/src/win32/map.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-12-11 15:02:20 -0800
committerRussell Belfer <rb@github.com>2013-12-11 15:02:20 -0800
commit7697e54176ccab22ed6d4597d7256e9a1e6ff202 (patch)
tree69c1bdd91bcf767b28bd6bc5ea9612084c1a765c /src/win32/map.c
parent8b22d862fb4419b219210027f18c1e97dd36fa8b (diff)
downloadlibgit2-7697e54176ccab22ed6d4597d7256e9a1e6ff202.tar.gz
Test cancel from indexer progress callback
This adds tests that try canceling an indexer operation from within the progress callback. After writing the tests, I wanted to run this under valgrind and had a number of errors in that situation because mmap wasn't working. I added a CMake option to force emulation of mmap and consolidated the Amiga-specific code into that new place (so we don't actually need separate Amiga code now, just have to turn on -DNO_MMAP). Additionally, I made the indexer code propagate error codes more reliably than it used to.
Diffstat (limited to 'src/win32/map.c')
-rw-r--r--src/win32/map.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/win32/map.c b/src/win32/map.c
index 44c6c4e2e..902ea3994 100644
--- a/src/win32/map.c
+++ b/src/win32/map.c
@@ -8,6 +8,7 @@
#include "map.h"
#include <errno.h>
+#ifndef NO_MMAP
static DWORD get_page_size(void)
{
@@ -112,4 +113,4 @@ int p_munmap(git_map *map)
return error;
}
-
+#endif