Update to NSPR 4.9.5 Beta 2, part 2: actual changes.

mozilla/nsprpub/pr/include/md/_unixos.h

 /* -*- 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/. */
 
 #ifndef prunixos_h___
 #define prunixos_h___
 
 /*
  * If FD_SETSIZE is not defined on the command line, set the default value
  * before include select.h
  */
 /*
  * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
  * not be redefined.
  */
 #if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
-    && !defined(DARWIN) && !defined(NEXTSTEP)
+    && !defined(DARWIN)
 #ifndef FD_SETSIZE
 #define FD_SETSIZE  4096
 #endif
 #endif
 
 #include <unistd.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
@@ skipping 111 matching lines @@
 ** Make a redzone at both ends of the stack segment. Disallow access
 ** to those pages of memory. It's ok if the mprotect call's don't
 ** work - it just means that we don't really have a functional
 ** redzone.
 */
 #include <sys/mman.h>
 #ifndef PROT_NONE
 #define PROT_NONE 0x0
 #endif
 
-#if defined(DEBUG) && !defined(DARWIN) && !defined(NEXTSTEP)
+#if defined(DEBUG) && !defined(DARWIN)
 #if !defined(SOLARIS)   
 #include <string.h>  /* for memset() */
 #define _MD_INIT_STACK(ts,REDZONE)                                      \
     PR_BEGIN_MACRO                                                      \
         (void) mprotect((void*)ts->seg->vaddr, REDZONE, PROT_NONE);     \
         (void) mprotect((void*) ((char*)ts->seg->vaddr + REDZONE + ts->stackSize),\
                         REDZONE, PROT_NONE);                            \
     /*                                                                  \
     ** Fill stack memory with something that turns into an illegal      \
     ** pointer value. This will sometimes find runtime references to    \
@@ skipping 126 matching lines @@
 extern void             _MD_FreeSegment(PRSegment *seg);
 
 #define _MD_INIT_SEGS                   _MD_InitSegs
 #define _MD_ALLOC_SEGMENT               _MD_AllocSegment
 #define _MD_FREE_SEGMENT                _MD_FreeSegment
 
 #endif /* !defined(_PR_PTHREADS) */
 
 /************************************************************************/
 
-#if !defined(HPUX_LW_TIMER)
+#ifdef _MD_INTERVAL_USE_GTOD
+extern PRIntervalTime   _PR_UNIX_GetInterval(void);
+extern PRIntervalTime   _PR_UNIX_TicksPerSecond(void);
 #define _MD_INTERVAL_INIT()
+#define _MD_GET_INTERVAL                _PR_UNIX_GetInterval
+#define _MD_INTERVAL_PER_SEC            _PR_UNIX_TicksPerSecond
 #endif
+
+#ifdef HAVE_CLOCK_MONOTONIC
+extern PRIntervalTime   _PR_UNIX_GetInterval2(void);
+extern PRIntervalTime   _PR_UNIX_TicksPerSecond2(void);
+#define _MD_INTERVAL_INIT()
+#define _MD_GET_INTERVAL                _PR_UNIX_GetInterval2
+#define _MD_INTERVAL_PER_SEC            _PR_UNIX_TicksPerSecond2
+#endif
+
 #define _MD_INTERVAL_PER_MILLISEC()     (_PR_MD_INTERVAL_PER_SEC() / 1000)
 #define _MD_INTERVAL_PER_MICROSEC()     (_PR_MD_INTERVAL_PER_SEC() / 1000000)
 
 /************************************************************************/
 
 #define _MD_ERRNO()                     (errno)
 #define _MD_GET_SOCKET_ERROR()          (errno)
 
 /************************************************************************/
 
@@ skipping 286 matching lines @@
 {
     _MD_Open64 _open64;
     _MD_Mmap64 _mmap64;
     _MD_Stat64 _stat64;
     _MD_Fstat64 _fstat64;
     _MD_Lseek64 _lseek64;
 };
 extern struct _MD_IOVector _md_iovector;
 
 #endif /* prunixos_h___ */