From 11ae5ebfb66727ba6f6d4e9a878ec0795e18993a Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Sat, 9 Jan 2016 14:16:13 -0800
Subject: [PATCH] Replace __page_size reference with PAGE_SIZE for android-12
 and below

Also remove __getpageshift since it is not present in later version of
android (>12)

Bug: http://b/26475272
Bug: https://github.com/android-ndk/ndk/issues/1
Change-Id: I117194ede3b13a63ff020364b0f573fb25d5205d
---
 ndk/platforms/android-12/include/unistd.h | 7 +------
 ndk/platforms/android-3/include/unistd.h  | 7 +------
 ndk/platforms/android-8/include/unistd.h  | 7 +------
 ndk/platforms/android-9/include/unistd.h  | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/ndk/platforms/android-12/include/unistd.h b/ndk/platforms/android-12/include/unistd.h
index d1fe5c78d..e6ffa1e53 100644
--- a/ndk/platforms/android-12/include/unistd.h
+++ b/ndk/platforms/android-12/include/unistd.h
@@ -172,12 +172,7 @@ extern int ttyname_r(int, char*, size_t);
 extern int  acct(const char*  filepath);
 
 static __inline__ int getpagesize(void) {
-  extern unsigned int __page_size;
-  return __page_size;
-}
-static __inline__ int __getpageshift(void) {
-  extern unsigned int __page_shift;
-  return __page_shift;
+  return PAGE_SIZE;
 }
 
 long sysconf(int);
diff --git a/ndk/platforms/android-3/include/unistd.h b/ndk/platforms/android-3/include/unistd.h
index 7e1127257..471aa3922 100644
--- a/ndk/platforms/android-3/include/unistd.h
+++ b/ndk/platforms/android-3/include/unistd.h
@@ -160,12 +160,7 @@ extern char* ttyname(int);
 extern int  acct(const char*  filepath);
 
 static __inline__ int getpagesize(void) {
-  extern unsigned int __page_size;
-  return __page_size;
-}
-static __inline__ int __getpageshift(void) {
-  extern unsigned int __page_shift;
-  return __page_shift;
+  return PAGE_SIZE;
 }
 
 long sysconf(int);
diff --git a/ndk/platforms/android-8/include/unistd.h b/ndk/platforms/android-8/include/unistd.h
index b106fe6e9..f5f1e9e5f 100644
--- a/ndk/platforms/android-8/include/unistd.h
+++ b/ndk/platforms/android-8/include/unistd.h
@@ -165,12 +165,7 @@ extern int ttyname_r(int, char*, size_t);
 extern int  acct(const char*  filepath);
 
 static __inline__ int getpagesize(void) {
-  extern unsigned int __page_size;
-  return __page_size;
-}
-static __inline__ int __getpageshift(void) {
-  extern unsigned int __page_shift;
-  return __page_shift;
+  return PAGE_SIZE;
 }
 
 long sysconf(int);
diff --git a/ndk/platforms/android-9/include/unistd.h b/ndk/platforms/android-9/include/unistd.h
index 86f352b25..ab91596f7 100644
--- a/ndk/platforms/android-9/include/unistd.h
+++ b/ndk/platforms/android-9/include/unistd.h
@@ -169,12 +169,7 @@ extern int ttyname_r(int, char*, size_t);
 extern int  acct(const char*  filepath);
 
 static __inline__ int getpagesize(void) {
-  extern unsigned int __page_size;
-  return __page_size;
-}
-static __inline__ int __getpageshift(void) {
-  extern unsigned int __page_shift;
-  return __page_shift;
+  return PAGE_SIZE;
 }
 
 long sysconf(int);