summaryrefslogtreecommitdiffstats
path: root/modules/libjar
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-11 22:41:59 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-11 22:41:59 +0100
commit329d35ab57451a668331667221eef7352ef04ef6 (patch)
treee9cfdb38aa59f09c46df71a856de6ade171f380e /modules/libjar
parentd0da27ef572152d1fdd82a9ac15bd5c23ad68160 (diff)
parentcffb44547ae7997e5eaf71c644bd626eeb3bba00 (diff)
downloadUXP-329d35ab57451a668331667221eef7352ef04ef6.tar
UXP-329d35ab57451a668331667221eef7352ef04ef6.tar.gz
UXP-329d35ab57451a668331667221eef7352ef04ef6.tar.lz
UXP-329d35ab57451a668331667221eef7352ef04ef6.tar.xz
UXP-329d35ab57451a668331667221eef7352ef04ef6.zip
Merge branch 'release' into Basilisk-releasev2020.01.12
Diffstat (limited to 'modules/libjar')
-rw-r--r--modules/libjar/nsZipArchive.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp
index 429de1011..841503ebf 100644
--- a/modules/libjar/nsZipArchive.cpp
+++ b/modules/libjar/nsZipArchive.cpp
@@ -688,7 +688,9 @@ MOZ_WIN_MEM_TRY_BEGIN
// Success means optimized jar layout from bug 559961 is in effect
uint32_t readaheadLength = xtolong(startp);
if (readaheadLength) {
-#if defined(XP_UNIX)
+#ifdef XP_SOLARIS
+ posix_madvise(const_cast<uint8_t*>(startp), readaheadLength, POSIX_MADV_WILLNEED);
+#elif defined(XP_UNIX)
madvise(const_cast<uint8_t*>(startp), readaheadLength, MADV_WILLNEED);
#elif defined(XP_WIN)
if (aFd) {