diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:01:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:01:38 +0100 |
| commit | f7d30133221896638f7bf4f66c504255c4b14f48 (patch) | |
| tree | 5f3e07a049f388a3a309a615b8884318f6668a98 /nsprpub/pr/src/md/prosdep.c | |
| parent | 26b297510a11758727438df4669357a2a2bc42ce (diff) | |
| download | UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar.gz UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar.lz UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar.xz UXP-f7d30133221896638f7bf4f66c504255c4b14f48.zip | |
Issue #1338 - Part 1: Update NSPR to 4.24
Diffstat (limited to 'nsprpub/pr/src/md/prosdep.c')
| -rw-r--r-- | nsprpub/pr/src/md/prosdep.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/nsprpub/pr/src/md/prosdep.c b/nsprpub/pr/src/md/prosdep.c index 137ffaecc..0b1f3e597 100644 --- a/nsprpub/pr/src/md/prosdep.c +++ b/nsprpub/pr/src/md/prosdep.c @@ -11,9 +11,6 @@ #endif #ifdef _WIN32 #include <windows.h> -#endif -#ifdef XP_BEOS -#include <OS.h> #endif PRInt32 _pr_pageShift; @@ -24,14 +21,14 @@ PRInt32 _pr_pageSize; */ static void GetPageSize(void) { - PRInt32 pageSize; + PRInt32 pageSize; /* Get page size */ #ifdef XP_UNIX #if defined BSDI || defined AIX \ || defined LINUX || defined __GNU__ || defined __GLIBC__ \ || defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined DARWIN || defined SYMBIAN + || defined DARWIN _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ @@ -41,10 +38,6 @@ static void GetPageSize(void) #endif #endif /* XP_UNIX */ -#ifdef XP_BEOS - _pr_pageSize = B_PAGE_SIZE; -#endif - #ifdef XP_PC #ifdef _WIN32 SYSTEM_INFO info; @@ -55,14 +48,14 @@ static void GetPageSize(void) #endif #endif /* XP_PC */ - pageSize = _pr_pageSize; - PR_CEILING_LOG2(_pr_pageShift, pageSize); + pageSize = _pr_pageSize; + PR_CEILING_LOG2(_pr_pageShift, pageSize); } PR_IMPLEMENT(PRInt32) PR_GetPageShift(void) { if (!_pr_pageSize) { - GetPageSize(); + GetPageSize(); } return _pr_pageShift; } @@ -70,7 +63,7 @@ PR_IMPLEMENT(PRInt32) PR_GetPageShift(void) PR_IMPLEMENT(PRInt32) PR_GetPageSize(void) { if (!_pr_pageSize) { - GetPageSize(); + GetPageSize(); } return _pr_pageSize; } |