Fix for Android >= api level 19.

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

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "primpl.h"
 
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
@@ skipping 12 matching lines @@
 
 /* To get FIONREAD */
 #if defined(UNIXWARE)
 #include <sys/filio.h>
 #endif
 
 #if defined(NTO)
 #include <sys/statvfs.h>
 #endif
 
+#if defined(ANDROID)
+#include <android/api-level.h>
+#endif
+
 /*
  * Make sure _PRSockLen_t is 32-bit, because we will cast a PRUint32* or
  * PRInt32* pointer to a _PRSockLen_t* pointer.
  */
 #if defined(HAVE_SOCKLEN_T) \
     || (defined(__GLIBC__) && __GLIBC__ >= 2)
 #define _PRSockLen_t socklen_t
 #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
     || defined(AIX4_1) || defined(LINUX) \
     || defined(BSDI) || defined(SCO) \
@@ skipping 2659 matching lines @@
 
 static void* _MD_Unix_mmap64(
     void *addr, PRSize len, PRIntn prot, PRIntn flags,
     PRIntn fildes, PRInt64 offset)
 {
     PR_SetError(PR_FILE_TOO_BIG_ERROR, 0);
     return NULL;
 }  /* _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 __ANDROID_API__ <= 19
 extern void *__mmap2(void *, size_t, int, int, int, size_t);
 
 #define ANDROID_PAGE_SIZE 4096
 
 static void *
 mmap64(void *addr, size_t len, int prot, int flags, int fd, loff_t offset)
 {
     if (offset & (ANDROID_PAGE_SIZE - 1)) {
         errno = EINVAL;
         return MAP_FAILED;
     }
     return __mmap2(addr, len, prot, flags, fd, offset / ANDROID_PAGE_SIZE);
 }
-#endif
+#endif  // __ANDROID_API__ <= 19
+#endif  // defined(ANDROID)

[wtc, 2014/07/22 23:45:12]

Nit: use pre-C99 /* */ comment delimiters in this file for consistency.

 
 #if defined(OSF1) && defined(__GNUC__)
 
 /*
  * On OSF1 V5.0A, <sys/stat.h> defines stat and fstat as
  * macros when compiled under gcc, so it is rather tricky to
  * take the addresses of the real functions the macros expend
  * to.  A simple solution is to define forwarder functions
  * and take the addresses of the forwarder functions instead.
  */
@@ skipping 1036 matching lines @@
                 rv++;
             }
         }
         PR_ASSERT(rv > 0);
     }
     PR_ASSERT(-1 != timeout || rv != 0);
 
     return rv;
 }
 #endif /* _PR_NEED_FAKE_POLL */