Merge pull request #929 from leleliu008/fix-undeclared-MAP_POPULATE

MAP_POPULATE is Linux-specific and not declared on other platforms
openzim · Aug 30, 2024 · cdcbb6c · cdcbb6c
2 parents 3130784 + 51bdcf3
commit cdcbb6c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/file_reader.cpp b/src/file_reader.cpp
@@ -143,12 +143,12 @@ class MMapException : std::exception {};
 char*
 mmapReadOnly(int fd, offset_type offset, size_type size)
 {
-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__HAIKU__)
- const auto MAP_FLAGS = MAP_PRIVATE;
+#if defined(__linux__)
+ const auto MAP_FLAGS = MAP_PRIVATE|MAP_POPULATE;
 #elif defined(__FreeBSD__)
  const auto MAP_FLAGS = MAP_PRIVATE|MAP_PREFAULT_READ;
 #else
- const auto MAP_FLAGS = MAP_PRIVATE|MAP_POPULATE;
+ const auto MAP_FLAGS = MAP_PRIVATE;
 #endif
 
  const auto p = (char*)mmap(NULL, size, PROT_READ, MAP_FLAGS, fd, offset);