X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=compat%2Fwin32mmap.c;h=b58aa69fa0609dad7f591024f9da31dfa58496fb;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=779d796cd5f017d4effbede360185a4690cf414e;hpb=9affecbc89538b6fd63f772b6f14047bced9345e;p=git.git diff --git a/compat/win32mmap.c b/compat/win32mmap.c index 779d796cd..b58aa69fa 100644 --- a/compat/win32mmap.c +++ b/compat/win32mmap.c @@ -1,34 +1,22 @@ #include "../git-compat-util.h" -/* - * Note that this doesn't return the actual pagesize, but - * the allocation granularity. If future Windows specific git code - * needs the real getpagesize function, we need to find another solution. - */ -int mingw_getpagesize(void) -{ - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwAllocationGranularity; -} - void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) { HANDLE hmap; void *temp; - size_t len; + off_t len; struct stat st; uint64_t o = offset; uint32_t l = o & 0xFFFFFFFF; uint32_t h = (o >> 32) & 0xFFFFFFFF; if (!fstat(fd, &st)) - len = xsize_t(st.st_size); + len = st.st_size; else die("mmap: could not determine filesize"); if ((length + offset) > len) - length = len - offset; + length = xsize_t(len - offset); if (!(flags & MAP_PRIVATE)) die("Invalid usage of mmap when built with USE_WIN32_MMAP");