Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 43 insertions, 43 deletions

diff --git a/nsprpub/pr/include/md/_unixware.h b/nsprpub/pr/include/md/_unixware.h
index ef76f5a1b..06667b298 100644
--- a/nsprpub/pr/include/md/_unixware.h
+++ b/nsprpub/pr/include/md/_unixware.h
@@ -10,18 +10,18 @@
  * Internal configuration macros
  */
 
-#define PR_LINKER_ARCH	"unixware"
-#define _PR_SI_SYSNAME		"UnixWare"
-#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 PR_LINKER_ARCH  "unixware"
+#define _PR_SI_SYSNAME      "UnixWare"
+#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_MMAP_FLAGS          MAP_PRIVATE
 
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
+#ifndef HAVE_WEAK_IO_SYMBOLS
+#define HAVE_WEAK_IO_SYMBOLS
 #endif
 #define _PR_POLL_AVAILABLE
 #define _PR_USE_POLL
@@ -29,8 +29,8 @@
 
 #undef  HAVE_STACK_GROWING_UP
 #define HAVE_NETCONFIG
-#define	HAVE_DLL
-#define	USE_DLFCN
+#define HAVE_DLL
+#define USE_DLFCN
 #define HAVE_STRERROR
 #define NEED_STRFTIME_LOCK
 #define NEED_TIME_R
@@ -44,7 +44,7 @@
 #define _LONGJMP longjmp
 #define _PR_CONTEXT_TYPE         jmp_buf
 #define _MD_GET_SP(_t)           (_t)->md.context[4]
-#define _PR_NUM_GCREGS	_JBLEN
+#define _PR_NUM_GCREGS  _JBLEN
 
 #define CONTEXT(_th) ((_th)->md.context)
 
@@ -52,7 +52,7 @@
 ** 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); \
@@ -60,22 +60,22 @@
 
 #define _MD_SWITCH_CONTEXT(_thread)  \
     if (!_SETJMP(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
+    (_thread)->md.errcode = errno;  \
+    _PR_Schedule();          \
     }
 
 /*
 ** Restore a thread context, saved by _MD_SWITCH_CONTEXT
 */
 #define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;	     \
+{                    \
+    errno = (_thread)->md.errcode;       \
     _MD_SET_CURRENT_THREAD(_thread); \
     _LONGJMP(CONTEXT(_thread), 1);    \
 }
 
 /* Machine-dependent (MD) data structures.
- * Don't use SVR4 native threads (yet). 
+ * Don't use SVR4 native threads (yet).
  */
 
 struct _MDThread {
@@ -117,31 +117,31 @@ struct _MDCPU_Unix {
 #ifndef _PR_USE_POLL
     fd_set fd_read_set, fd_write_set, fd_exception_set;
     PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
+            fd_exception_cnt[_PR_MD_MAX_OSFD];
 #else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
+    struct pollfd *ioq_pollfds;
+    int ioq_pollfds_size;
+#endif  /* _PR_USE_POLL */
 };
 
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
+#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_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()
@@ -160,13 +160,13 @@ struct _MDCPU {
  */
 #define _MD_INTERVAL_USE_GTOD
 
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
+#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)
 
 /*
@@ -177,7 +177,7 @@ struct _MDCPU {
 #include <sys/types.h>
 #include <sys/select.h>
 extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *execptfds, struct timeval *timeout);
+                   fd_set *execptfds, struct timeval *timeout);
 #define _MD_SELECT _select
 
 #define _MD_POLL _poll