Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 61 insertions, 61 deletions

diff --git a/nsprpub/pr/include/md/_nto.h b/nsprpub/pr/include/md/_nto.h
index 95309756b..1094dd183 100644
--- a/nsprpub/pr/include/md/_nto.h
+++ b/nsprpub/pr/include/md/_nto.h
@@ -9,19 +9,19 @@
 /*
 ** Internal configuration macros
 */
-#define PR_LINKER_ARCH		"nto"
-#define _PR_SI_SYSNAME		"NTO"
-#define _PR_SI_ARCHITECTURE	"x86"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MINIMUM_STACK_SIZE	131072L
-#define _MD_MMAP_FLAGS		MAP_PRIVATE
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
+#define PR_LINKER_ARCH      "nto"
+#define _PR_SI_SYSNAME      "NTO"
+#define _PR_SI_ARCHITECTURE "x86"
+#define PR_DLL_SUFFIX       ".so"
+
+#define _PR_VMBASE      0x30000000
+#define _PR_STACK_VMBASE    0x50000000
+#define _MD_DEFAULT_STACK_SIZE  65536L
+#define _MD_MINIMUM_STACK_SIZE  131072L
+#define _MD_MMAP_FLAGS      MAP_PRIVATE
+
+#ifndef HAVE_WEAK_IO_SYMBOLS
+#define HAVE_WEAK_IO_SYMBOLS
 #endif
 
 #undef  _PR_POLL_AVAILABLE
@@ -35,14 +35,14 @@
 #define _PR_HAVE_POSIX_SEMAPHORES
 
 #undef FD_SETSIZE
-#define FD_SETSIZE	4096
+#define FD_SETSIZE  4096
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/select.h>
 
 #undef  HAVE_STACK_GROWING_UP
-#define	HAVE_DLL
-#define	USE_DLFCN
+#define HAVE_DLL
+#define USE_DLFCN
 #define NEED_STRFTIME_LOCK
 #define NEED_TIME_R
 #define _PR_NEED_STRCASECMP
@@ -55,39 +55,39 @@
 
 #include <setjmp.h>
 
-#define _SETJMP			setjmp
-#define _LONGJMP		longjmp
-#define _PR_CONTEXT_TYPE	jmp_buf
-#define _PR_NUM_GCREGS		_JBLEN
-#define _MD_GET_SP(_t)		(_t)->md.context[7]
+#define _SETJMP         setjmp
+#define _LONGJMP        longjmp
+#define _PR_CONTEXT_TYPE    jmp_buf
+#define _PR_NUM_GCREGS      _JBLEN
+#define _MD_GET_SP(_t)      (_t)->md.context[7]
 
-#define CONTEXT(_th)		((_th)->md.context)
+#define CONTEXT(_th)        ((_th)->md.context)
 
 
 /*
 ** Initialize the thread context preparing it to execute _main.
 */
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	\
-{							\
-    *status = PR_TRUE;					\
-    if(_SETJMP(CONTEXT(_thread))) (*_main)();		\
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128);		\
+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)   \
+{                           \
+    *status = PR_TRUE;                  \
+    if(_SETJMP(CONTEXT(_thread))) (*_main)();       \
+    _MD_GET_SP(_thread) = (int) ((_sp) - 128);      \
 }
 
-#define _MD_SWITCH_CONTEXT(_thread)	\
-    if (!_SETJMP(CONTEXT(_thread))) {	\
-	(_thread)->md.errcode = errno;	\
-	_PR_Schedule();			\
+#define _MD_SWITCH_CONTEXT(_thread) \
+    if (!_SETJMP(CONTEXT(_thread))) {   \
+    (_thread)->md.errcode = errno;  \
+    _PR_Schedule();         \
     }
 
 /*
 ** Restore a thread context, saved by _MD_SWITCH_CONTEXT
 */
-#define _MD_RESTORE_CONTEXT(_thread)	\
-{					\
-    errno = (_thread)->md.errcode;	\
-    _MD_SET_CURRENT_THREAD(_thread);	\
-    _LONGJMP(CONTEXT(_thread), 1);	\
+#define _MD_RESTORE_CONTEXT(_thread)    \
+{                   \
+    errno = (_thread)->md.errcode;  \
+    _MD_SET_CURRENT_THREAD(_thread);    \
+    _LONGJMP(CONTEXT(_thread), 1);  \
 }
 
 /*
@@ -122,7 +122,7 @@ struct _MDSegment {
 /*
 ** md-specific cpu structure field
 */
-#define _PR_MD_MAX_OSFD		FD_SETSIZE
+#define _PR_MD_MAX_OSFD     FD_SETSIZE
 
 struct _MDCPU_Unix {
     PRCList ioQ;
@@ -138,28 +138,28 @@ struct _MDCPU_Unix {
 #endif
 };
 
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu)	PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
+#define _PR_IOQ(_cpu)           ((_cpu)->md.md_unix.ioQ)
+#define _PR_ADD_TO_IOQ(_pq, _cpu)   PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
+#define _PR_FD_READ_SET(_cpu)       ((_cpu)->md.md_unix.fd_read_set)
+#define _PR_FD_READ_CNT(_cpu)       ((_cpu)->md.md_unix.fd_read_cnt)
+#define _PR_FD_WRITE_SET(_cpu)      ((_cpu)->md.md_unix.fd_write_set)
+#define _PR_FD_WRITE_CNT(_cpu)      ((_cpu)->md.md_unix.fd_write_cnt)
+#define _PR_FD_EXCEPTION_SET(_cpu)  ((_cpu)->md.md_unix.fd_exception_set)
+#define _PR_FD_EXCEPTION_CNT(_cpu)  ((_cpu)->md.md_unix.fd_exception_cnt)
+#define _PR_IOQ_TIMEOUT(_cpu)       ((_cpu)->md.md_unix.ioq_timeout)
+#define _PR_IOQ_MAX_OSFD(_cpu)      ((_cpu)->md.md_unix.ioq_max_osfd)
+#define _PR_IOQ_OSFD_CNT(_cpu)      ((_cpu)->md.md_unix.ioq_osfd_cnt)
+#define _PR_IOQ_POLLFDS(_cpu)       ((_cpu)->md.md_unix.ioq_pollfds)
+#define _PR_IOQ_POLLFDS_SIZE(_cpu)  ((_cpu)->md.md_unix.ioq_pollfds_size)
+
+#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)  32
 
 struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
+    struct _MDCPU_Unix md_unix;
 };
 
 #define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock)		PR_SUCCESS
+#define _MD_NEW_LOCK(lock)      PR_SUCCESS
 #define _MD_FREE_LOCK(lock)
 #define _MD_LOCK(lock)
 #define _MD_UNLOCK(lock)
@@ -168,20 +168,20 @@ struct _MDCPU {
 #define _MD_IOQ_UNLOCK()
 
 #define _MD_INTERVAL_USE_GTOD
-#define _MD_EARLY_INIT			_MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu)	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD			_MD_InitializeThread
+#define _MD_EARLY_INIT          _MD_EarlyInit
+#define _MD_FINAL_INIT          _PR_UnixInit
+#define _MD_INIT_RUNNING_CPU(cpu)   _MD_unix_init_running_cpu(cpu)
+#define _MD_INIT_THREAD         _MD_InitializeThread
 #define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
+#define _MD_SUSPEND_THREAD(thread)
+#define _MD_RESUME_THREAD(thread)
 #define _MD_CLEAN_THREAD(_thread)
 
 /*
 ** We wrapped the select() call.  _MD_SELECT refers to the built-in,
 ** unwrapped version.
 */
-#define _MD_SELECT		select
+#define _MD_SELECT      select
 
 #define SA_RESTART 0