nspr/pr/src/md/unix/unix.c - Issue 539213003: Update to NSPR 4.10.7.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: nspr/pr/src/md/unix/unix.c

Issue 539213003: Update to NSPR 4.10.7. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: nspr/pr/src/md/unix/unix.c

diff --git a/nspr/pr/src/md/unix/unix.c b/nspr/pr/src/md/unix/unix.c

index 38f7be9b3ef6266acca343a6f3298aec960fb2c0..4f27b82fff9ab48bc049895af2ce8fea44fdbee0 100644

--- a/nspr/pr/src/md/unix/unix.c

+++ b/nspr/pr/src/md/unix/unix.c

@@ -21,6 +21,10 @@

#include <poll.h>

#endif

+#if defined(ANDROID)

+#include <android/api-level.h>

+#endif

/* To get FIONREAD */

#if defined(UNIXWARE)

#include <sys/filio.h>

@@ -2709,8 +2713,8 @@ static void* _MD_Unix_mmap64(

} /* _MD_Unix_mmap64 */

#endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */

-/* Android doesn't have mmap64. */

-#if defined(ANDROID)

+/* Android <= 19 doesn't have mmap64. */

+#if defined(ANDROID) && __ANDROID_API__ <= 19

extern void *__mmap2(void *, size_t, int, int, int, size_t);

#define ANDROID_PAGE_SIZE 4096

« no previous file with comments | « nspr/pr/include/prinit.h ('k') | scripts/nspr-checkout.sh » ('j') | no next file with comments »