Attachment 163129 Details for Bug 204277 – firefox 42 and nspr 4.10.10, next take

[patch] firefox 42 and nspr 4.10.10, next take

firefox42_take5.diff (text/plain), 123.60 KB, created by Christoph Moench-Tegeder on 2015-11-15 00:12:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2015-11-15 00:12:17 UTC

Size: 123.60 KB

patch

obsolete

>diff -Nru devel/nspr/Makefile devel/nspr/Makefile
>--- devel/nspr/Makefile	2015-08-25 12:30:49.489307891 +0200
>+++ devel/nspr/Makefile	2015-11-04 09:15:34.000000000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/nspr/Makefile 394866 2015-08-20 13:13:18Z jbeich $
> 
> PORTNAME=	nspr
>-DISTVERSION=	4.10.9
>+DISTVERSION=	4.10.10
> CATEGORIES=	devel
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
> 
>diff -Nru devel/nspr/distinfo devel/nspr/distinfo
>--- devel/nspr/distinfo	2015-08-25 12:30:49.404308291 +0200
>+++ devel/nspr/distinfo	2015-11-04 09:15:34.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (nspr-4.10.9.tar.gz) = 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881
>-SIZE (nspr-4.10.9.tar.gz) = 1134015
>+SHA256 (nspr-4.10.10.tar.gz) = 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107
>+SIZE (nspr-4.10.10.tar.gz) = 1134164
>diff -Nru devel/nspr/files/patch-tests devel/nspr/files/patch-tests
>--- devel/nspr/files/patch-tests	2015-07-18 22:12:18.793461998 +0200
>+++ devel/nspr/files/patch-tests	2015-11-04 09:15:45.000000000 +0100
>@@ -1,13 +1,59 @@
>---- ../pr/tests/cleanup.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/cleanup.c	Tue Jul 12 01:19:53 2005
>-@@ -48,5 +48,5 @@
>+--- ../lib/tests/Makefile.in.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../lib/tests/Makefile.in	2015-11-04 02:02:20.438739000 +0000
>+@@ -167,7 +167,7 @@ else
>+ ifeq ($(OS_ARCH),OS2)
>+ 	$(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC)  $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS)
>+ else
>+-	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@
>++	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
>+ endif
>+ endif
>+ endif
>+--- ../pr/tests/Makefile.in.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/Makefile.in	2015-11-04 02:02:20.439768000 +0000
>+@@ -489,17 +489,18 @@ endif
>+ ALWAYS:
>+ 
>+ runtests:: $(PROGS) ALWAYS
>+-	@$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n"
>+-	@$(ECHO) "BEGIN\t\t\t`date`"
>+-	@$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n"
>+-	@$(ECHO) "Test\t\t\tResult\n"
>++	@$(ECHO) "NSPR Test Results - $(OBJDIR)"
>++	@$(ECHO) "BEGIN			`date`"
>++	@$(ECHO) "Test			Result"
>+ 	@cd $(OBJDIR); for i in $(PROGRAMS); do					\
>+-	$(ECHO) "$$i\c";										\
>+-	./$$i >> $(LOGFILE) 2>&1 ;								\
>++	printf "$$i";										\
>++	./$$i > $$i.output 2>&1;								\
>+ 	if  [ 0 = $$? ] ; then									\
>+-		$(ECHO) "\t\t\tPassed";								\
>+-	else													\
>+-		$(ECHO) "\t\t\tFAILED";								\
>+-	fi;														\
>++		$(ECHO) "			Passed";					\
>++		rm $$i.output;									\
>++	else											\
>++		$(ECHO) "			FAILED";					\
>++		cat $$i.output;									\
>++	fi;											\
>+ 	done
>+-	@$(ECHO) "\nEND\t\t`date`\n"
>++	@$(ECHO) "END		`date`"
>+--- ../pr/tests/cleanup.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/cleanup.c	2015-11-04 02:02:20.433719000 +0000
>+@@ -15,7 +15,7 @@
>+ 
>  static void PR_CALLBACK Thread(void *sleep)
>  {
> -    PR_Sleep(PR_SecondsToInterval((PRUint32)sleep));
> +    PR_Sleep(PR_SecondsToInterval((intptr_t)sleep));
>      printf("Thread exiting\n");
>  }
>-@@ -72,5 +72,6 @@
>+ 
>+@@ -39,7 +39,8 @@ int main(int argc, char **argv)
>+ 	PRThreadScope type = PR_LOCAL_THREAD;
>      PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
>      PLOptState *opt = PL_CreateOptState(argc, argv, "Ghs:S:t:cC:");
> -    PRIntn concurrency = 1, child_sleep = 10, main_sleep = 5, threads = 1;
>@@ -15,23 +61,38 @@
> +    intptr_t child_sleep = 10;
>  
>      PR_STDIO_INIT();
>-@@ -113,5 +114,5 @@
>+     while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
>+@@ -80,7 +81,7 @@ int main(int argc, char **argv)
>+         (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL");
>      PR_fprintf(err, "\tConcurrency: %d\n", concurrency);
>      PR_fprintf(err, "\tNumber of threads: %d\n", threads);
> -    PR_fprintf(err, "\tThread sleep: %d\n", child_sleep);
> +    PR_fprintf(err, "\tThread sleep: %d\n", (int)child_sleep);
>      PR_fprintf(err, "\tMain sleep: %d\n", main_sleep); 
>      PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT "); 
>---- ../pr/tests/cvar.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/cvar.c	Tue Jul 12 01:22:52 2005
>-@@ -174,5 +174,5 @@
>+ 
>+--- ../pr/tests/cltsrv.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/cltsrv.c	2015-11-04 02:02:20.467222000 +0000
>+@@ -887,7 +887,7 @@ int main(int argc, char** argv)
>+ {
>+     PRUintn index;
>+     PRBool boolean;
>+-    CSClient_t *client;
>++    CSClient_t *client = NULL;
>+     PRStatus rv, joinStatus;
>+     CSServer_t *server = NULL;
>+ 
>+--- ../pr/tests/cvar.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/cvar.c	2015-11-04 02:02:20.434287000 +0000
>+@@ -135,14 +135,14 @@ static int alive;
>+ static void PR_CALLBACK CXReader(void *arg)
>  {
>  	CircBuf *cbp = (CircBuf *)arg;
> -    PRInt32 i, n;
> +    intptr_t i, n;
>      void *data;
>  
>-@@ -180,6 +180,6 @@
>+     n = count / 2;
>      for (i = 0; i < n; i++) {
>  		data = GetCBData(cbp);
> -		if ((int)data != i)
>@@ -40,174 +101,229 @@
> +    		if (debug_mode) printf("data mismatch at for i = %ld usec\n", (long)i);
>      }
>   
>-@@ -193,5 +193,5 @@
>+     PR_EnterMonitor(mon);
>+@@ -154,7 +154,7 @@ static void PR_CALLBACK CXReader(void *a
>+ static void PR_CALLBACK CXWriter(void *arg)
>  {
>  	CircBuf *cbp = (CircBuf *)arg;
> -    PRInt32 i, n;
> +    intptr_t i, n;
>  
>      n = count / 2;
>---- ../pr/tests/foreign.c	Mon Mar  7 20:22:57 2005
>-+++ ../pr/tests/foreign.c	Tue Jul 12 01:25:31 2005
>-@@ -269,5 +269,5 @@
>+     for (i = 0; i < n; i++)
>+--- ../pr/tests/cvar2.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/cvar2.c	2015-11-04 02:02:20.452205000 +0000
>+@@ -95,7 +95,7 @@ PrivateCondVarThread(void *_info)
>+     for (index=0; index<info->loops; index++) {
>+         PR_Lock(info->lock);
>+         if (*info->tcount == 0) {
>+-	    DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n",
>++	    DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n",
>+ 				PR_GetCurrentThread(), info->cvar));
>+             PR_WaitCondVar(info->cvar, info->timeout);
>+ 	}
>+@@ -108,8 +108,8 @@ PrivateCondVarThread(void *_info)
>+         PR_Lock(info->exitlock);
>+         (*info->exitcount)++;
>+         PR_NotifyCondVar(info->exitcvar);
>+-DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n",
>+-			PR_GetCurrentThread(), info->exitcvar,(*info->exitcount)));
>++DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n",
>++			PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount)));
>+         PR_Unlock(info->exitlock);
>+     }
>+ #if 0
>+@@ -157,7 +157,7 @@ CreateTestThread(threadinfo *info, 
>+ void 
>+ CondVarTestSUU(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -189,7 +189,7 @@ CondVarTestSUU(void *_arg)
>+                          PR_TRUE,
>+                          PR_LOCAL_THREAD);
>+         index++;
>+-	DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread));
>++	DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread));
>+     }
>+ 
>+     for (loops = 0; loops < count; loops++) {
>+@@ -199,7 +199,7 @@ CondVarTestSUU(void *_arg)
>+             (*list[index].tcount)++;
>+             PR_NotifyCondVar(list[index].cvar);
>+             PR_Unlock(list[index].lock);
>+-	    DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n",
>++	    DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n",
>+ 				PR_GetCurrentThread(), list[index].cvar));
>+         }
>+ 
>+@@ -227,7 +227,7 @@ CondVarTestSUU(void *_arg)
>+ void 
>+ CondVarTestSUK(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -301,7 +301,7 @@ CondVarTestSUK(void *_arg)
>+ void 
>+ CondVarTestPUU(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -336,7 +336,7 @@ CondVarTestPUU(void *_arg)
>+                          PR_FALSE,
>+                          PR_LOCAL_THREAD);
>+ 
>+-	DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread));
>++	DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread));
>+         index++;
>+ 	tcount++;
>+     }
>+@@ -354,8 +354,8 @@ CondVarTestPUU(void *_arg)
>+ 	PR_Lock(exitlock);
>+         /* Wait for threads to finish */
>+         while(exitcount < arg) {
>+-DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n",
>+-				PR_GetCurrentThread(), exitcvar, exitcount));
>++DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n",
>++				PR_GetCurrentThread(), exitcvar, (int)exitcount));
>+             	PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
>+ 	}
>+         PR_ASSERT(exitcount >= arg);
>+@@ -365,7 +365,7 @@ DPRINTF(("CondVarTestPUU: thread 0x%lx w
>+ 
>+     /* Join all the threads */
>+     for(index=0; index<(arg); index++)  {
>+-	DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread));
>++	DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread));
>+         PR_JoinThread(list[index].thread);
>+         if (list[index].internal) {
>+             PR_Lock(list[index].lock);
>+@@ -387,7 +387,7 @@ DPRINTF(("CondVarTestPUU: thread 0x%lx w
>+ void 
>+ CondVarTestPUK(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -468,7 +468,7 @@ CondVarTestPUK(void *_arg)
>+ void 
>+ CondVarTest(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -601,7 +601,7 @@ CondVarTest(void *_arg)
>+ void 
>+ CondVarTimeoutTest(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -712,7 +712,7 @@ CondVarTimeoutTest(void *_arg)
>+ void 
>+ CondVarMixedTest(void *_arg)
>+ {
>+-    PRInt32 arg = (PRInt32)_arg;
>++    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>+     PRInt32 index, loops;
>+     threadinfo *list;
>+     PRLock *sharedlock;
>+@@ -802,7 +802,7 @@ CondVarMixedTest(void *_arg)
>+         for(index=0; index<(arg*4); index+=3) {
>+ 
>+             PR_Lock(list[index].lock);
>+-            *list[index].tcount++;
>++            list[index].tcount++;
>+             PR_NotifyCondVar(list[index].cvar);
>+             PR_Unlock(list[index].lock);
>+ 
>+@@ -873,7 +873,7 @@ static void Measure(void (*func)(void *)
>+     double d;
>+ 
>+     start = PR_IntervalNow();
>+-    (*func)((void *)arg);
>++    (*func)((void *)(intptr_t)arg);
>+     stop = PR_IntervalNow();
>+ 
>+     d = (double)PR_IntervalToMicroseconds(stop - start);
>+@@ -932,7 +932,7 @@ default_threads, default_threads*2, defa
>+     PR_SetConcurrency(2);
>+ 
>+     for (threads = default_threads; threads < default_threads*5; threads+=default_threads) {
>+-        printf("\n%ld Thread tests\n", threads);
>++        printf("\n%d Thread tests\n", (int)threads);
>+         Measure(CondVarTestSUU, threads, "Condvar simple test shared UU");
>+         Measure(CondVarTestSUK, threads, "Condvar simple test shared UK");
>+         Measure(CondVarTestPUU, threads, "Condvar simple test priv UU");
>+--- ../pr/tests/foreign.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/foreign.c	2015-11-04 02:02:20.434883000 +0000
>+@@ -202,7 +202,7 @@ static void OneShot(void *arg)
>+     PRFileDesc *fd;
>      PRDir *dir;
>      PRFileDesc *pair[2];
> -    PRIntn test = (PRIntn)arg;
> +    intptr_t test = (intptr_t)arg;
>  
>  	for (test = 0; test < 12; ++test) {
>-@@ -364,5 +364,5 @@
>+ 
>+@@ -302,7 +302,7 @@ static void OneShot(void *arg)
>+ int main(int argc, char **argv)
>  {
>      PRStatus rv;
> -	PRInt32	thread_cnt = DEFAULT_THREAD_COUNT;
> +	intptr_t	thread_cnt = DEFAULT_THREAD_COUNT;
>  	PLOptStatus os;
>  	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
>---- ../pr/tests/forktest.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/forktest.c	Tue Jul 12 01:28:15 2005
>-@@ -80,5 +80,5 @@
>+ 
>+--- ../pr/tests/forktest.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/forktest.c	2015-11-04 02:02:20.435492000 +0000
>+@@ -47,7 +47,7 @@ ClientThreadFunc(void *arg)
>+ {
>      PRNetAddr addr;
>      PRFileDesc *sock = NULL;
> -    PRInt32 tmp = (PRInt32)arg;
> +    intptr_t tmp = (intptr_t)arg;
>  
>      /*
>-@@ -176,5 +176,5 @@
>+      * Make sure the PR_Accept call will block
>+@@ -143,7 +143,7 @@ DoIO(void)
>+         goto finish;
>      }
>      clientThread = PR_CreateThread( PR_USER_THREAD, ClientThreadFunc,
> -        (void *) PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
> +        (void *)(intptr_t)PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>          PR_JOINABLE_THREAD, 0);
>      if (clientThread == NULL) {
>-@@ -185,2 +185,5 @@
>+         fprintf(stderr, "Cannot create client thread: (%d, %d)\n",
>+@@ -151,6 +151,9 @@ DoIO(void)
>+         failed_already = 1;
>+         goto finish;
>      }
> +    printf("Wait one second before accept\n");
> +    fflush(stdout);
> +    PR_Sleep(PR_SecondsToInterval(1));
>      printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));
>---- ../pr/tests/mbcs.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/mbcs.c	Tue Jul 12 01:34:26 2005
>-@@ -87,5 +87,5 @@
>- ** Traverse directory
>- */
>--static void TraverseDirectory( unsigned char *dir )
>-+static void TraverseDirectory(const char *dir)
>- {
>-     PRDir *cwd;
>-@@ -93,5 +93,4 @@
>-     PRFileInfo info;
>-     PRStatus rc;
>--    PRInt32 err;
>-     PRFileDesc *fd;
>-     char    nextDir[256];
>-@@ -114,14 +114,14 @@
>-         }
>-         if ( PR_FILE_FILE == info.type )  {
>--            printf("File: %s \tsize: %ld\n", dirEntry->name, info.size );
>-+            printf("File: %s \tsize: %ld\n", dirEntry->name, (long)info.size );
>-             fd = PR_Open( file, PR_RDONLY, 0 );
>-             if ( NULL == fd )  {
>-                 printf("PR_Open() failed. Error: %ld, OSError: %ld\n", 
>--                    PR_GetError(), PR_GetOSError());
>-+                    (long)PR_GetError(), (long)PR_GetOSError());
>-             }
>-             rc = PR_Close( fd );
>-             if ( PR_FAILURE == rc )  {
>-                 printf("PR_Close() failed. Error: %ld, OSError: %ld\n", 
>--                    PR_GetError(), PR_GetOSError());
>-+                    (long)PR_GetError(), (long)PR_GetOSError());
>-             }
>-         } else if ( PR_FILE_DIRECTORY == info.type ) {
>---- ../pr/tests/nonblock.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/nonblock.c	Tue Jul 12 01:37:52 2005
>-@@ -84,5 +84,5 @@
>- clientThreadFunc(void *arg)
>- {
>--    PRUintn port = (PRUintn)arg;
>-+    intptr_t port = (intptr_t)arg;
>-     PRFileDesc *sock;
>-     PRNetAddr addr;
>-@@ -196,5 +196,5 @@
>- 
>-     clientThread = PR_CreateThread(PR_USER_THREAD,
>--	    clientThreadFunc, (void *) listenPort,
>-+	    clientThreadFunc, (void *) (intptr_t)listenPort,
>- 	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>- 	    PR_UNJOINABLE_THREAD, 0);
>-@@ -240,5 +240,5 @@
>-         PL_PrintError("First Receive:\n");
>- 	    fprintf(stderr, "First PR_Recv: retVal: %ld, Error: %ld\n",
>--            retVal, PR_GetError());
>-+            (long)retVal, (long)PR_GetError());
>- 	    exit(1);
>-         }
>-@@ -250,5 +250,5 @@
>-         PL_PrintError("Second Receive:\n");
>- 	    fprintf(stderr, "Second PR_Recv: retVal: %ld, Error: %ld\n", 
>--            retVal, PR_GetError());
>-+            (long)retVal, (long)PR_GetError());
>- 	    exit(1);
>-         }
>---- ../pr/tests/peek.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/peek.c	Tue Jul 12 01:41:44 2005
>-@@ -168,5 +168,5 @@
>-     PRFileDesc *sock;
>-     PRSocketOptionData opt;
>--    PRUint16 port = (PRUint16) arg;
>-+    PRUint16 port = (intptr_t) arg;
>-     PRNetAddr addr;
>-     char buf[BUFFER_SIZE];
>-@@ -332,5 +332,5 @@
>-     }
>-     client = PR_CreateThread(
>--            PR_USER_THREAD, ClientNB, (void *) port,
>-+            PR_USER_THREAD, ClientNB, (void *)(intptr_t) port,
>-             PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
>-     if (NULL == client) {
>---- ../pr/tests/pipepong.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/pipepong.c	Tue Jul 12 01:43:52 2005
>-@@ -69,5 +69,5 @@
>-         fprintf(stderr, "pong process: received \"%s\"\n", buf);
>-         if (nBytes != 5) {
>--            fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n",
>-+            fprintf(stderr, "pong process: expected 5 bytes but got %zd bytes\n",
>-                     nBytes);
>-             exit(1);
>---- ../pr/tests/poll_nm.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/poll_nm.c	Tue Jul 12 01:45:57 2005
>-@@ -97,5 +97,5 @@
>- clientThreadFunc(void *arg)
>- {
>--    PRUintn port = (PRUintn) arg;
>-+    PRUintn port = (intptr_t) arg;
>-     PRFileDesc *sock;
>-     PRNetAddr addr;
>-@@ -251,5 +251,5 @@
>- 
>-     clientThread = PR_CreateThread(PR_USER_THREAD,
>--	    clientThreadFunc, (void *) listenPort1,
>-+	    clientThreadFunc, (void *)(intptr_t)listenPort1,
>- 	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>- 	    PR_UNJOINABLE_THREAD, 0);
>-@@ -261,5 +261,5 @@
>- 
>-     clientThread = PR_CreateThread(PR_USER_THREAD,
>--	    clientThreadFunc, (void *) listenPort2,
>-+	    clientThreadFunc, (void *)(intptr_t)listenPort2,
>- 	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>- 	    PR_UNJOINABLE_THREAD, 0);
>---- ../lib/tests/Makefile.in	Sun Nov  7 21:52:55 2004
>-+++ ../lib/tests/Makefile.in	Tue Jul 12 01:49:15 2005
>-@@ -247,5 +247,5 @@
>- 	$(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC)  $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS)
>- else
>--	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@
>-+	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
>- endif
>- endif
>---- ../pr/tests/getai.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/getai.c	Tue Jul 12 02:20:40 2005
>-@@ -46,6 +46,11 @@
>+     fflush(stdout);
>+     sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
>+--- ../pr/tests/getai.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/getai.c	2015-11-04 02:02:20.439194000 +0000
>+@@ -13,8 +13,13 @@ int main(int argc, char **argv)
>+     PRAddrInfo *ai;
>      void *iter;
>      PRNetAddr addr;
> +    const char *host;
>@@ -220,52 +336,27 @@
> +    ai = PR_GetAddrInfoByName(host, PR_AF_UNSPEC, PR_AI_ADDRCONFIG);
>      if (ai == NULL) {
>          fprintf(stderr, "PR_GetAddrInfoByName failed: (%d, %d)\n",
>---- ../pr/tests/Makefile.in	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/Makefile.in	Tue Jul 12 02:25:18 2005
>-@@ -556,16 +557,17 @@
>- 
>- runtests:: $(PROGS) ALWAYS
>--	@$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n"
>--	@$(ECHO) "BEGIN\t\t\t`date`"
>--	@$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n"
>--	@$(ECHO) "Test\t\t\tResult\n"
>-+	@$(ECHO) "NSPR Test Results - $(OBJDIR)"
>-+	@$(ECHO) "BEGIN			`date`"
>-+	@$(ECHO) "Test			Result"
>- 	@cd $(OBJDIR); for i in $(PROGRAMS); do					\
>--	$(ECHO) "$$i\c";										\
>--	./$$i >> $(LOGFILE) 2>&1 ;								\
>-+	printf "$$i";										\
>-+	./$$i > $$i.output 2>&1;								\
>- 	if  [ 0 = $$? ] ; then									\
>--		$(ECHO) "\t\t\tPassed";								\
>--	else													\
>--		$(ECHO) "\t\t\tFAILED";								\
>--	fi;														\
>-+		$(ECHO) "			Passed";					\
>-+		rm $$i.output;									\
>-+	else											\
>-+		$(ECHO) "			FAILED";					\
>-+		cat $$i.output;									\
>-+	fi;											\
>- 	done
>--	@$(ECHO) "\nEND\t\t`date`\n"
>-+	@$(ECHO) "END		`date`"
>---- ../pr/tests/instrumt.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/instrumt.c	Mon Jul 25 20:45:54 2005
>-@@ -69,4 +69,5 @@
>+             PR_GetError(), PR_GetOSError());
>+--- ../pr/tests/instrumt.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/instrumt.c	2015-11-04 02:02:20.440472000 +0000
>+@@ -36,6 +36,7 @@
>+ */
>  
>  #include <stdio.h>
> +#define DEBUG
>  #include <plstr.h>
>  #include <prclist.h>
>-@@ -83,5 +84,4 @@
>+ #include <prmem.h>
>+@@ -50,7 +51,6 @@
>+ #define COUNT_LIMIT  (10 * ( 1024))
>  
>  #define SMALL_TRACE_BUFSIZE  ( 60 * 1024 )
> -
>  typedef enum 
>  {
>-@@ -111,8 +111,8 @@
>+     CountLoop = 1,
>+@@ -78,10 +78,10 @@ static void Help(void)
>+ 
>  static void ListCounters(void)
>  {
> +#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
>@@ -275,7 +366,9 @@
> -    const char **qname = &qn, **rname = &rn, **desc = &dn;
>      PRUint32    tCtr;
>  
>-@@ -125,6 +125,6 @@
>+     PR_INIT_COUNTER_HANDLE( qh, NULL );
>+@@ -92,7 +92,7 @@ static void ListCounters(void)
>+         PR_FIND_NEXT_COUNTER_RNAME(rh, rh, qh );
>          while ( rh != NULL )
>          {
> -            PR_GET_COUNTER_NAME_FROM_HANDLE( rh, qname, rname, desc );
>@@ -283,7 +376,8 @@
>              PR_GET_COUNTER(tCtr, rh);
>              PR_LOG( lm, msgLevel,
>                  ( "QName: %s  RName: %s  Desc: %s  Value: %ld\n", 
>-@@ -134,13 +134,13 @@
>+@@ -101,15 +101,15 @@ static void ListCounters(void)
>+         } 
>          PR_FIND_NEXT_COUNTER_QNAME(qh, qh);
>      }
> -    return;    
>@@ -299,30 +393,107 @@
> -    const char **qname = &qn, **rname = &rn, **desc = &dn;
>  
>      PR_INIT_TRACE_HANDLE( qh, NULL );
>-@@ -152,5 +152,5 @@
>+     PR_FIND_NEXT_TRACE_QNAME(qh, qh );
>+@@ -119,7 +119,7 @@ static void ListTraces(void)
>+         PR_FIND_NEXT_TRACE_RNAME(rh, rh, qh );
>          while ( rh != NULL )
>          {
> -            PR_GET_TRACE_NAME_FROM_HANDLE( rh, qname, rname, desc );
> +            PR_GET_TRACE_NAME_FROM_HANDLE( rh, &qn, &rn, &dn );
>              PR_LOG( lm, msgLevel,
>                  ( "QName: %s  RName: %s  Desc: %s", 
>-@@ -160,5 +160,5 @@
>+                 qn, rn, dn ));
>+@@ -127,7 +127,7 @@ static void ListTraces(void)
>+         } 
>          PR_FIND_NEXT_TRACE_QNAME(qh, qh);
>      }
> -    return;    
> +#endif
>  } /* end ListCounters() */
>  
>-@@ -359,5 +359,5 @@
>+ 
>+@@ -326,7 +326,7 @@ static void PR_CALLBACK SampleTrace( voi
>+ */
>  static void TraceTest( void )
>  {
> -    PRInt32 i;
> +    PRIntn i = 0;
>      PRInt32 size;
>      PR_DEFINE_TRACE( th );
>---- ../pr/tests/layer.c	Fri Apr 29 18:46:05 2005
>-+++ ../pr/tests/layer.c	Mon Jul 25 20:53:03 2005
>-@@ -78,5 +78,8 @@
>+     PRThread *t1, *t2;
>+--- ../pr/tests/io_timeout.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/io_timeout.c	2015-11-04 02:02:20.452831000 +0000
>+@@ -22,11 +22,13 @@
>+ /* Used to get the command line option */
>+ #include "plgetopt.h"
>+ 
>++#include <errno.h>
>+ #include <stdio.h>
>++#include <string.h>
>+ #include "nspr.h"
>+ 
>+ #define NUM_THREADS 1
>+-#define BASE_PORT   8000
>++#define BASE_PORT   38011
>+ #define DEFAULT_ACCEPT_TIMEOUT 2
>+ 
>+ typedef struct threadInfo {
>+@@ -38,7 +40,7 @@ typedef struct threadInfo {
>+ } threadInfo;
>+ 
>+ PRIntn failed_already = 0;
>+-PRIntn debug_mode = 0;
>++PRIntn debug_mode = 1;
>+ 
>+ #define	LOCAL_SCOPE_STRING			"LOCAL scope"
>+ #define	GLOBAL_SCOPE_STRING			"GLOBAL scope"
>+@@ -54,7 +56,7 @@ thread_main(void *_info)
>+     PRFileDesc *clientSock;
>+     PRStatus rv;
>+ 	PRThreadScope tscope;
>+-	char *scope_str;
>++	const char *scope_str;
>+ 
>+  
>+ 	if (debug_mode)
>+@@ -73,6 +75,7 @@ thread_main(void *_info)
>+ 			break;
>+ 		default:
>+ 			PR_NOT_REACHED("Invalid thread scope");
>++			scope_str = NULL;
>+ 			break;
>+ 	}
>+ 	printf("thread id %d, scope %s\n", info->id, scope_str);
>+@@ -91,7 +94,12 @@ thread_main(void *_info)
>+     rv = PR_Bind(listenSock, &listenAddr);
>+     if (rv == PR_FAILURE) {
>+ 		if (debug_mode)
>+-        	printf("unable to bind\n");
>++			printf("unable to bind to %d: %s\n",
>++			    BASE_PORT + info->id, strerror(PR_GetOSError()));
>++		if (PR_GetOSError() == EADDRINUSE) {
>++			printf("can not proceed with this test\n");
>++			exit(0);
>++		}
>+ 		failed_already=1;
>+         goto dead;
>+     }
>+@@ -113,8 +121,9 @@ thread_main(void *_info)
>+     if (clientSock == NULL) {
>+         if (PR_GetError() == PR_IO_TIMEOUT_ERROR) {
>+ 			if (debug_mode) {	
>+-            	printf("PR_Accept() timeout worked!\n"); 
>+-				printf("TEST PASSED! PR_Accept() returned error %d\n",
>++				printf("PR_Accept() timeout worked!\n"
>++				    "TEST PASSED! PR_Accept() returned error "
>++				    "PR_IO_TIMEOUT_ERROR (%ld)\n",
>+ 							PR_IO_TIMEOUT_ERROR);
>+ 			}
>+     	} else {
>+--- ../pr/tests/layer.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/layer.c	2015-11-04 02:02:20.441092000 +0000
>+@@ -45,7 +45,10 @@ static PRUint16 default_port = 12273;
>+ static PRFileDesc *PushLayer(PRFileDesc *stack)
>  {
>      PRFileDesc *layer = PR_CreateIOLayerStub(identity, &myMethods);
> -    PRStatus rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
>@@ -332,119 +503,226 @@
> +	PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
>      if (verbosity > quiet)
>          PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer, stack);
>---- ../pr/tests/lazyinit.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/lazyinit.c	Mon Jul 25 20:54:18 2005
>-@@ -76,5 +76,4 @@
>+     PR_ASSERT(PR_SUCCESS == rv);
>+--- ../pr/tests/lazyinit.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/lazyinit.c	2015-11-04 02:02:20.441575000 +0000
>+@@ -43,7 +43,6 @@ int main(int argc, char **argv)
>+     char *path = NULL;
>      PRDir *dir = NULL;
>      PRLock *ml = NULL;
> -    PRCondVar *cv = NULL;
>      PRThread *thread = NULL;
>      PRIntervalTime interval = 0;
>---- ../pr/tests/lltest.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/lltest.c	Mon Jul 25 20:57:30 2005
>-@@ -578,4 +578,5 @@
>+     PRFileDesc *file, *udp, *tcp, *pair[2];
>+--- ../pr/tests/lltest.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/lltest.c	2015-11-04 02:02:20.442340000 +0000
>+@@ -545,6 +545,7 @@ TestConversion( void )
>+     return;
>  }
>  
> +#if 0
>  static void ShiftCompileOnly()
>  {
>-@@ -594,4 +595,5 @@
>+     /*
>+@@ -561,6 +562,7 @@ static void ShiftCompileOnly()
>+     LL_ISHL(ia, 49, 32);
>  
>  }  /* ShiftCompileOnly */
> +#endif
>     
>  
>-@@ -668,5 +670,4 @@
>+ /*
>+@@ -635,7 +637,6 @@ TestArithmetic( void )
>+     PRInt64 largeValPlusOne   = LL_INIT( 0x00000002, 0x00000000 );
>      PRInt64 largeValTimesTwo  = LL_INIT( 0x00000003, 0xfffffffe );
>      PRInt64 largeMultCand     = LL_INIT( 0x00000000, 0x7fffffff );
> -    PRInt64 largeMinusMultCand = LL_INIT( 0xffffffff, 0x10000001 );
>      PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 );
>      PRInt64 largeNumSHL5      = LL_INIT( 0x0000001f, 0xffffffe0 );        
>---- ../pr/tests/nbconn.c	Fri Apr 29 18:46:05 2005
>-+++ ../pr/tests/nbconn.c	Mon Jul 25 21:00:51 2005
>-@@ -93,6 +93,5 @@
>+     PRInt64 result, result2;
>+--- ../pr/tests/mbcs.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/mbcs.c	2015-11-04 02:02:20.436041000 +0000
>+@@ -54,13 +54,12 @@ char *dirName =  NULL;  /* directory nam
>+ /*
>+ ** Traverse directory
>+ */
>+-static void TraverseDirectory( unsigned char *dir )
>++static void TraverseDirectory(const char *dir)
>+ {
>+     PRDir *cwd;
>+     PRDirEntry *dirEntry;
>+     PRFileInfo info;
>+     PRStatus rc;
>+-    PRInt32 err;
>+     PRFileDesc *fd;
>+     char    nextDir[256];
>+     char    file[256];
>+@@ -81,16 +80,16 @@ static void TraverseDirectory( unsigned 
>+             exit(1);
>+         }
>+         if ( PR_FILE_FILE == info.type )  {
>+-            printf("File: %s \tsize: %ld\n", dirEntry->name, info.size );
>++            printf("File: %s \tsize: %ld\n", dirEntry->name, (long)info.size );
>+             fd = PR_Open( file, PR_RDONLY, 0 );
>+             if ( NULL == fd )  {
>+                 printf("PR_Open() failed. Error: %ld, OSError: %ld\n", 
>+-                    PR_GetError(), PR_GetOSError());
>++                    (long)PR_GetError(), (long)PR_GetOSError());
>+             }
>+             rc = PR_Close( fd );
>+             if ( PR_FAILURE == rc )  {
>+                 printf("PR_Close() failed. Error: %ld, OSError: %ld\n", 
>+-                    PR_GetError(), PR_GetOSError());
>++                    (long)PR_GetError(), (long)PR_GetOSError());
>+             }
>+         } else if ( PR_FILE_DIRECTORY == info.type ) {
>+             sprintf( nextDir, "%s/%s", dir, dirEntry->name );
>+--- ../pr/tests/nbconn.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/nbconn.c	2015-11-04 02:02:20.443098000 +0000
>+@@ -54,8 +54,7 @@ int main(int argc, char **argv)
>+     PRStatus rv;
>      PRSocketOptionData optData;
>  	const char *hostname = NULL;
> -    PRIntn default_case, n, bytes_read, bytes_sent;
> -	PRInt32 failed_already = 0;
> +    PRIntn default_case, n;
>- #ifdef XP_MAC
>- 	int index;
>-@@ -226,5 +225,5 @@
>+ 
>+     /*
>+      * -d           debug mode
>+@@ -164,7 +163,7 @@ int main(int argc, char **argv)
>+ 				exit(1);
>  			}
>  			printf( "PR_GetConnectStatus: connect failed: (%ld, %ld)\n",
> -					PR_GetError(), PR_GetOSError());
> +					(long)PR_GetError(), (long)PR_GetOSError());
>  		}
>  		PR_Close(sock);
>-@@ -300,5 +299,5 @@
>+     	printf( "PASS\n");
>+@@ -235,7 +234,7 @@ connection_success_test()
>+ 	PRThread *thr = NULL;
>  	Server_Param sp;
>  	char send_buf[DATA_BUF_SIZE], recv_buf[DATA_BUF_SIZE];
> -    PRIntn default_case, n, bytes_read, bytes_sent;
> +    PRIntn n, bytes_read, bytes_sent;
>      PRIntn failed_already = 0;
>  
>-@@ -376,5 +375,5 @@
>+ 	/*
>+@@ -311,7 +310,7 @@ connection_success_test()
>+ 		failed_already=1;
>  		goto def_exit;
>  	}
> -	DPRINTF(("Created TCP_Server thread [0x%x]\n",thr));
> +	DPRINTF(("Created TCP_Server thread [%p]\n", thr));
>  	pd.fd = conn_fd;
>  	pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
>-@@ -459,5 +458,5 @@
>+ 	n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
>+@@ -390,7 +389,7 @@ connection_success_test()
>+ 		DPRINTF(("Data integrity verified\n"));
>  	} else {
>  		fprintf(stderr,"PR_GetConnectStatus: connect failed: (%ld, %ld)\n",
> -				PR_GetError(), PR_GetOSError());
> +				(long)PR_GetError(), (long)PR_GetOSError());
>  		failed_already = 1;
>  		goto def_exit;
>-@@ -569,5 +568,4 @@
>+ 	}
>+@@ -496,7 +495,6 @@ connection_failure_test()
>+ 		goto def_exit;
>  	}
>  	if (PR_GetConnectStatus(&pd) == PR_SUCCESS) {
> -		PRInt32 rv;
>  		fprintf(stderr,"PR_GetConnectStatus succeeded, expected to fail\n");
>  		failed_already = 1;
>---- ../pr/tests/nblayer.c	2009-02-23 00:00:44.000000000 -0500
>-+++ ../pr/tests/nblayer.c	2009-11-04 16:22:00.000000000 -0500
>-@@ -332,5 +332,5 @@
>+ 		goto def_exit;
>+--- ../pr/tests/nblayer.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/nblayer.c	2015-11-04 02:02:20.443837000 +0000
>+@@ -299,7 +299,7 @@ static PRStatus PR_CALLBACK MyClose(PRFi
>+ static PRInt16 PR_CALLBACK MyPoll(
>      PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
>  {
> -    PRInt16 my_flags, new_flags;
> +    PRInt16 my_flags = -1, new_flags;
>      PRFilePrivate *mine = (PRFilePrivate*)fd->secret;
>      if (0 != (PR_POLL_READ & in_flags))
>-@@ -375,5 +375,5 @@
>+     {
>+@@ -342,7 +342,7 @@ static PRFileDesc * PR_CALLBACK MyAccept
>+     PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout)
>  {
>      PRStatus rv;
> -    PRFileDesc *newfd, *layer = fd;
> +    PRFileDesc *newfd;
>      PRFileDesc *newstack;
>      PRFilePrivate *newsecret;
>-@@ -461,4 +461,6 @@
>+ 
>+@@ -428,6 +428,8 @@ static PRInt32 PR_CALLBACK MyRecv(
>+             mine->rcvinprogress = 0;
>              return mine->rcvreq;  /* << -- that's it! */
>          default:
> +            PR_ASSERT(!"How did I get this mine->rcvstate?");
> +            rv = -1;
>              break;
>          }
>-@@ -517,4 +517,6 @@
>+     } while (-1 != rv);
>+@@ -484,6 +486,8 @@ static PRInt32 PR_CALLBACK MySend(
>+             mine->xmtinprogress = 0;
>              return mine->xmtreq;  /* <<-- That's the one! */
>          default:
> +            PR_ASSERT(!"How did I get this mine->xmtstate?");
> +            rv = -1;
>              break;
>          }
>---- ../pr/tests/obsints.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/obsints.c	Mon Jul 25 21:04:56 2005
>-@@ -58,4 +58,7 @@
>+     } while (-1 != rv);
>+--- ../pr/tests/nonblock.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/nonblock.c	2015-11-04 02:02:20.436606000 +0000
>+@@ -39,7 +39,7 @@
>+ static void PR_CALLBACK
>+ clientThreadFunc(void *arg)
>+ {
>+-    PRUintn port = (PRUintn)arg;
>++    intptr_t port = (intptr_t)arg;
>+     PRFileDesc *sock;
>+     PRNetAddr addr;
>+     char buf[CHUNK_SIZE];
>+@@ -147,7 +147,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn
>+     printf("%s", buf);
>+ 
>+     clientThread = PR_CreateThread(PR_USER_THREAD,
>+-	    clientThreadFunc, (void *) listenPort,
>++	    clientThreadFunc, (void *) (intptr_t)listenPort,
>+ 	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>+ 	    PR_UNJOINABLE_THREAD, 0);
>+     if (clientThread == NULL) {
>+@@ -191,7 +191,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn
>+ 	if (retVal != -1 || PR_GetError() != PR_WOULD_BLOCK_ERROR) {
>+         PL_PrintError("First Receive:\n");
>+ 	    fprintf(stderr, "First PR_Recv: retVal: %ld, Error: %ld\n",
>+-            retVal, PR_GetError());
>++            (long)retVal, (long)PR_GetError());
>+ 	    exit(1);
>+         }
>+ 	printf("read: EWOULDBLOCK, good\n");
>+@@ -201,7 +201,7 @@ static PRIntn PR_CALLBACK RealMain( PRIn
>+ 	if (retVal != CHUNK_SIZE) {
>+         PL_PrintError("Second Receive:\n");
>+ 	    fprintf(stderr, "Second PR_Recv: retVal: %ld, Error: %ld\n", 
>+-            retVal, PR_GetError());
>++            (long)retVal, (long)PR_GetError());
>+ 	    exit(1);
>+         }
>+ 	printf("read: %d bytes, good\n", retVal);
>+--- ../pr/tests/obsints.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/obsints.c	2015-11-04 02:02:20.444330000 +0000
>+@@ -25,6 +25,9 @@ int main(int argc, char **argv)
>+ #else /* NO_NSPR_10_SUPPORT */
>  
>  #include "prtypes.h"  /* which includes protypes.h */
> +#if !defined(__GNUC__)
> +#	define __unused
> +#endif
>  
>- int main()
>-@@ -65,15 +68,15 @@
>+ int main(int argc, char **argv)
>+ {
>+@@ -32,17 +35,17 @@ int main(int argc, char **argv)
>+      * Compilation fails if any of these integer types are not
>       * defined by protypes.h.
>       */
> -    intn in;
>@@ -471,51 +749,107 @@
> +    uint64 ui64 __unused;
>  
>      printf("PASS\n");
>---- ../pr/tests/perf.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/perf.c	Mon Jul 25 21:05:55 2005
>-@@ -181,5 +181,5 @@
>+     return 0;
>+--- ../pr/tests/parsetm.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/parsetm.c	2015-11-04 02:02:20.467739000 +0000
>+@@ -31,8 +31,8 @@ static void PrintExplodedTime(const PREx
>+ 
>+     /* Print day of the week, month, day, hour, minute, and second */
>+     if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ",
>+-	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
>+-	    et->tm_hour, et->tm_min, et->tm_sec);
>++	    dayOfWeek[et->tm_wday], month[et->tm_month], (long)et->tm_mday,
>++	    (long)et->tm_hour, (long)et->tm_min, (long)et->tm_sec);
>+ 
>+     /* Print time zone */
>+     totalOffset = et->tm_params.tp_gmt_offset + et->tm_params.tp_dst_offset;
>+@@ -47,7 +47,7 @@ static void PrintExplodedTime(const PREx
>+         hourOffset = totalOffset / 3600;
>+         minOffset = (totalOffset % 3600) / 60;
>+         if (debug_mode) 
>+-            printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
>++            printf("%s%02ld%02ld ", sign, (long)hourOffset, (long)minOffset);
>+     }
>+ 
>+     /* Print year */
>+--- ../pr/tests/peek.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/peek.c	2015-11-04 02:02:20.437204000 +0000
>+@@ -135,7 +135,7 @@ static void ClientNB(void *arg)
>+ {
>+     PRFileDesc *sock;
>+     PRSocketOptionData opt;
>+-    PRUint16 port = (PRUint16) arg;
>++    PRUint16 port = (intptr_t) arg;
>+     PRNetAddr addr;
>+     char buf[BUFFER_SIZE];
>+     PRPollDesc pd;
>+@@ -299,7 +299,7 @@ RunTest(PRThreadScope scope, PRFileDesc 
>+         exit(1);
>+     }
>+     client = PR_CreateThread(
>+-            PR_USER_THREAD, ClientNB, (void *) port,
>++            PR_USER_THREAD, ClientNB, (void *)(intptr_t) port,
>+             PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
>+     if (NULL == client) {
>+         fprintf(stderr, "PR_CreateThread failed\n");
>+--- ../pr/tests/perf.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/perf.c	2015-11-04 02:02:20.445028000 +0000
>+@@ -141,7 +141,7 @@ static void PR_CALLBACK CXReader(void *a
>+     n = count / 2;
>      for (i = 0; i < n; i++) {
>      while (cxq == 0) {
> -            DPRINTF(("CXReader: thread = 0x%lx waiting\n",
> +            DPRINTF(("CXReader: thread = %p waiting\n",
>                      PR_GetCurrentThread()));
>          PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
>-@@ -194,5 +194,5 @@
>+     }
>+@@ -154,7 +154,7 @@ static void PR_CALLBACK CXReader(void *a
>+     --alive;
>      PR_Notify(mon2);
>      PR_ExitMonitor(mon2);
> -    DPRINTF(("CXReader: thread = 0x%lx exiting\n", PR_GetCurrentThread()));
> +    DPRINTF(("CXReader: thread = %p exiting\n", PR_GetCurrentThread()));
>  }
>  
>-@@ -205,5 +205,5 @@
>+ static void PR_CALLBACK CXWriter(void *arg)
>+@@ -165,7 +165,7 @@ static void PR_CALLBACK CXWriter(void *a
>+     n = count / 2;
>      for (i = 0; i < n; i++) {
>      while (cxq == 1) {
> -            DPRINTF(("CXWriter: thread = 0x%lx waiting\n",
> +            DPRINTF(("CXWriter: thread = %p waiting\n",
>                      PR_GetCurrentThread()));
>          PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
>-@@ -218,5 +218,5 @@
>+     }
>+@@ -178,7 +178,7 @@ static void PR_CALLBACK CXWriter(void *a
>+     --alive;
>      PR_Notify(mon2);
>      PR_ExitMonitor(mon2);
> -    DPRINTF(("CXWriter: thread = 0x%lx exiting\n", PR_GetCurrentThread()));
> +    DPRINTF(("CXWriter: thread = %p exiting\n", PR_GetCurrentThread()));
>  }
>  
>-@@ -238,5 +238,5 @@
>+ static void ContextSwitch(PRThreadScope scope1, PRThreadScope scope2)
>+@@ -198,7 +198,7 @@ static void ContextSwitch(PRThreadScope 
>+     if (NULL == t1) {
>          fprintf(stderr, "ContextSwitch: cannot create thread\n");
>      } else {
> -        DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n",
> +        DPRINTF(("ContextSwitch: created %s thread = %p\n",
>                  (scope1 == PR_GLOBAL_THREAD ?
>                  "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
>-@@ -252,5 +252,5 @@
>+                             t1));
>+@@ -212,7 +212,7 @@ static void ContextSwitch(PRThreadScope 
>+     if (NULL == t2) {
>          fprintf(stderr, "ContextSwitch: cannot create thread\n");
>      } else {
> -        DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n",
> +        DPRINTF(("ContextSwitch: created %s thread = %p\n",
>                  (scope2 == PR_GLOBAL_THREAD ?
>                  "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
>-@@ -294,8 +294,8 @@
>+                             t2));
>+@@ -254,10 +254,10 @@ static void PR_CALLBACK SemaThread(void 
>+ 
>      n = count / 2;
>      for (i = 0; i < n; i++) {
> -        DPRINTF(("SemaThread: thread = 0x%lx waiting on sem = 0x%lx\n",
>@@ -526,74 +860,155 @@
> +        DPRINTF(("SemaThread: thread = %p posting on sem = %p\n",
>                  PR_GetCurrentThread(), sem[1]));
>          PR_PostSem(sem[1]);
>-@@ -306,5 +306,5 @@
>+     }
>+@@ -266,7 +266,7 @@ static void PR_CALLBACK SemaThread(void 
>+     --alive;
>      PR_Notify(mon2);
>      PR_ExitMonitor(mon2);
> -    DPRINTF(("SemaThread: thread = 0x%lx exiting\n", PR_GetCurrentThread()));
> +    DPRINTF(("SemaThread: thread = %p exiting\n", PR_GetCurrentThread()));
>  }
>  
>-@@ -334,5 +334,5 @@
>+ static  PRSemaphore *sem_set1[2];
>+@@ -294,7 +294,7 @@ static void SemaContextSwitch(PRThreadSc
>+     if (NULL == t1) {
>          fprintf(stderr, "SemaContextSwitch: cannot create thread\n");
>      } else {
> -        DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n",
> +        DPRINTF(("SemaContextSwitch: created %s thread = %p\n",
>                  (scope1 == PR_GLOBAL_THREAD ?
>                  "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
>-@@ -349,5 +349,5 @@
>+                             t1));
>+@@ -309,7 +309,7 @@ static void SemaContextSwitch(PRThreadSc
>+     if (NULL == t2) {
>          fprintf(stderr, "SemaContextSwitch: cannot create thread\n");
>      } else {
> -        DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n",
> +        DPRINTF(("SemaContextSwitch: created %s thread = %p\n",
>                  (scope2 == PR_GLOBAL_THREAD ?
>                  "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
>---- ../pr/tests/prpoll.c	2009-05-06 01:40:39.000000000 -0400
>-+++ ../pr/tests/prpoll.c	2009-11-04 16:31:54.000000000 -0500
>-@@ -72,5 +72,5 @@
>+                             t2));
>+--- ../pr/tests/pipepong.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/pipepong.c	2015-11-04 02:02:20.437688000 +0000
>+@@ -36,7 +36,7 @@ int main(int argc, char **argv)
>+         nBytes = fread(buf, 1, 5, stdin);
>+         fprintf(stderr, "pong process: received \"%s\"\n", buf);
>+         if (nBytes != 5) {
>+-            fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n",
>++            fprintf(stderr, "pong process: expected 5 bytes but got %zd bytes\n",
>+                     nBytes);
>+             exit(1);
>+         }
>+--- ../pr/tests/poll_nm.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/poll_nm.c	2015-11-04 02:02:20.438299000 +0000
>+@@ -47,7 +47,7 @@ PRIntn debug_mode;
>+ static void PR_CALLBACK
>+ clientThreadFunc(void *arg)
>+ {
>+-    PRUintn port = (PRUintn) arg;
>++    PRUintn port = (intptr_t) arg;
>+     PRFileDesc *sock;
>+     PRNetAddr addr;
>+     char buf[128];
>+@@ -196,7 +196,7 @@ int main(int argc, char **argv)
>+     npds = 5;
>+ 
>+     clientThread = PR_CreateThread(PR_USER_THREAD,
>+-	    clientThreadFunc, (void *) listenPort1,
>++	    clientThreadFunc, (void *)(intptr_t)listenPort1,
>+ 	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>+ 	    PR_UNJOINABLE_THREAD, 0);
>+     if (clientThread == NULL) {
>+@@ -206,7 +206,7 @@ int main(int argc, char **argv)
>+     }
>+ 
>+     clientThread = PR_CreateThread(PR_USER_THREAD,
>+-	    clientThreadFunc, (void *) listenPort2,
>++	    clientThreadFunc, (void *)(intptr_t)listenPort2,
>+ 	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>+ 	    PR_UNJOINABLE_THREAD, 0);
>+     if (clientThread == NULL) {
>+--- ../pr/tests/provider.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/provider.c	2015-11-04 02:02:20.468667000 +0000
>+@@ -1049,7 +1049,7 @@ int main(int argc, char **argv)
>+ {
>+     PRUintn index;
>+     PRBool boolean;
>+-    CSClient_t *client;
>++    CSClient_t *client = NULL;
>+     PRStatus rv, joinStatus;
>+     CSServer_t *server = NULL;
>+ 	char *thread_type;
>+--- ../pr/tests/prpoll.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/prpoll.c	2015-11-04 02:02:20.445656000 +0000
>+@@ -39,7 +39,7 @@ int main(int argc, char **argv)
>+ static void
>  clientThreadFunc(void *arg)
>  {
> -    PRUint16 port = (PRUint16) arg;
> +    PRUint16 port = (PRUint16)(uintptr_t)arg;
>      PRFileDesc *sock;
>      PRNetAddr addr;
>-@@ -106,5 +106,5 @@
>+     char buf[BUF_SIZE];
>+@@ -73,7 +73,7 @@ int main(int argc, char **argv)
>+     PRInt32 rv;
>      PROsfd sd;
>      struct sockaddr_in saddr;
> -    PRIntn saddr_len;
> +    socklen_t saddr_len;
>      PRUint16 listenPort3;
>      PRFileDesc *socket_poll_fd;
>-@@ -232,5 +232,5 @@
>+     PRIntn i, j;
>+@@ -199,7 +199,7 @@ int main(int argc, char **argv)
>+     npds--;
>  
>      clientThread = PR_CreateThread(PR_USER_THREAD,
> -	    clientThreadFunc, (void *) listenPort1,
> +	    clientThreadFunc, (void *)(uintptr_t)listenPort1,
>  	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>  	    PR_UNJOINABLE_THREAD, 0);
>-@@ -241,5 +241,5 @@
>+     if (clientThread == NULL) {
>+@@ -208,7 +208,7 @@ int main(int argc, char **argv)
>+     }
>  
>      clientThread = PR_CreateThread(PR_USER_THREAD,
> -	    clientThreadFunc, (void *) listenPort2,
> +	    clientThreadFunc, (void *)(uintptr_t)listenPort2,
>  	    PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
>  	    PR_UNJOINABLE_THREAD, 0);
>-@@ -250,5 +250,5 @@
>+     if (clientThread == NULL) {
>+@@ -217,7 +217,7 @@ int main(int argc, char **argv)
>+     }
>  
>      clientThread = PR_CreateThread(PR_USER_THREAD,
> -	    clientThreadFunc, (void *) listenPort3,
> +	    clientThreadFunc, (void *)(uintptr_t)listenPort3,
>  	    PR_PRIORITY_NORMAL, PR_GLOBAL_BOUND_THREAD,
>  	    PR_UNJOINABLE_THREAD, 0);
>---- ../pr/tests/ranfile.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/ranfile.c	Mon Jul 25 21:13:44 2005
>-@@ -169,5 +169,5 @@
>+     if (clientThread == NULL) {
>+--- ../pr/tests/randseed.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/randseed.c	2015-11-04 02:02:20.446756000 +0000
>+@@ -48,7 +48,6 @@ static void Help( void )
>+ static void PrintRand( void *buf, PRIntn size )
>+ {
>+     PRUint32 *rp = buf;
>+-    PRIntn   i;
>+ 
>+     printf("%4.4d--\n", size );
>+     while (size > 0 ) {
>+--- ../pr/tests/ranfile.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/ranfile.c	2015-11-04 02:02:20.446281000 +0000
>+@@ -130,7 +130,7 @@ static void PR_CALLBACK Thread(void *arg
>+     PRStatus rv = PR_SUCCESS;
>      Hammer_t *cd = (Hammer_t*)arg;
>  
> -    (void)sprintf(filename, "%ssg%04ld.dat", baseName, cd->id);
> +    (void)sprintf(filename, "%ssg%04d.dat", baseName, (int)cd->id);
>  
>      if (debug_mode) printf("Starting work on %s\n", filename);
>-@@ -408,6 +408,6 @@
>+ 
>+@@ -364,14 +364,14 @@ int main(int argc, char **argv)
>+                 }
>                  else
>                      if (debug_mode) printf(
> -                        "%s: test failed %s after %ld seconds\n",
>@@ -602,24 +1017,114 @@
> +                        programName, where[hammer[poll].problem], (int)duration);
>  					else failed_already=1;
>              }
>-@@ -415,5 +415,5 @@
>+         }
>      }
>      if (debug_mode) printf(
> -        "%s: [%ld [%ld] %ld] writes/sec average\n",
> +        "%s: [%d [%d] %d] writes/sec average\n",
>          programName, writesMin, writesTot * 1000 / durationTot, writesMax);
>  
>---- ../pr/tests/randseed.c	Fri Apr 29 18:46:05 2005
>-+++ ../pr/tests/randseed.c	Mon Jul 25 21:15:01 2005
>-@@ -81,5 +81,4 @@
>- {
>-     PRUint32 *rp = buf;
>--    PRIntn   i;
>+     PR_DestroyCondVar(cv);
>+--- ../pr/tests/runtests.sh.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/runtests.sh	2015-11-04 02:02:20.463710000 +0000
>+@@ -58,9 +58,6 @@ fi
>+ # Tests not run (but should)
>+ #
>  
>-     printf("%4.4d--\n", size );
>---- ../pr/tests/sel_spd.c	2009-05-06 01:40:39.000000000 -0400
>-+++ ../pr/tests/sel_spd.c	2009-11-04 16:34:14.000000000 -0500
>-@@ -48,4 +48,7 @@
>+-#forktest (failed on IRIX)
>+-#nbconn - fails on some platforms 
>+-#poll_er - fails on some platforms? limited use?
>+ #prpoll -  the bad-FD test needs to be moved to a different test
>+ #sleep	-  specific to OS/2
>+ 
>+@@ -92,6 +89,7 @@ exit
>+ fdcach
>+ fileio
>+ foreign
>++forktest
>+ formattm
>+ fsync
>+ gethost
>+@@ -99,7 +97,6 @@ getproto
>+ i2l
>+ initclk
>+ inrval
>+-instrumt
>+ intrio
>+ intrupt
>+ io_timeout
>+@@ -120,6 +117,7 @@ logger
>+ many_cv
>+ multiwait
>+ nameshm1
>++nbconn
>+ nblayer
>+ nonblock
>+ ntioto
>+@@ -136,6 +134,7 @@ perf
>+ pipeping
>+ pipeping2
>+ pipeself
>++poll_er
>+ poll_nm
>+ poll_to
>+ pollable
>+@@ -208,7 +207,7 @@ OBJDIR=`basename $PWD`
>+ printf "\nNSPR Test Results - $OBJDIR\n\n"
>+ printf "BEGIN\t\t\t`date`\n"
>+ printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n"
>+-printf "Test\t\t\tResult\n\n"
>++printf "            Test\t\t\tResult\n\n"
>+ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
>+ 	for prog in $TESTS
>+ 	do
>+@@ -226,10 +225,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ 
>+ else
>+ 	for prog in $TESTS
>+ 	do
>+-		printf "$prog"
>+-		printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>+-		export test_rval
>+-		./$prog >> ${LOGFILE} 2>&1 &
>++		printf %16s $prog
>++		./$prog >> $prog.output 2>&1 &
>+ 		test_pid=$!
>+ 		sleep_pid=0
>+ 		if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0
>+@@ -244,28 +241,11 @@ else
>+ 			printf "\t\t\tPassed\n";
>+ 		else
>+ 			printf "\t\t\tFAILED\n";
>++			sed "s,^,	$prog:	," < $prog.output
>+ 			rval=1
>+ 		fi;
>+-		printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>+ 	done
>+ fi;
>+ 
>+ printf "END\t\t\t`date`\n"
>+ exit $rval
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+--- ../pr/tests/sel_spd.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/sel_spd.c	2015-11-04 02:02:20.447432000 +0000
>+@@ -15,6 +15,9 @@
>+ #include <stdio.h>
>  #include <errno.h>
>  #include <string.h>
> +#if defined(XP_UNIX) || defined(XP_OS2_EMX)
>@@ -627,7 +1132,9 @@
> +#endif
>  #ifdef SYMBIAN
>  #include <getopt.h>
>-@@ -55,14 +58,14 @@
>+ #endif
>+@@ -22,16 +25,16 @@
>+ #define PORT_BASE 19000
>  
>  typedef struct timer_slot_t {
> -	unsigned long d_connect;
>@@ -650,7 +1157,9 @@
> +static int _client_data = 8192;
>  
>  #ifdef SYMBIAN
>-@@ -73,10 +76,9 @@
>+ /*
>+@@ -40,12 +43,11 @@ static long _client_data = 8192;
>+  * memory and not be able to allocate thread stack or client/server data
>   * buffer.
>   */
> -static long _server_data = (8*1024);
>@@ -664,14 +1173,18 @@
> +static int _threads_max = 10, _threads = 10;
>  
>  static int verbose=0;
>-@@ -134,5 +136,5 @@
>+ static PRMonitor *exit_cv;
>+@@ -101,7 +103,7 @@ _server_thread(void *arg_id)
>+ 	void _client_thread(void *);
>  	PRThread *thread;
>  	int *id =  (int *)arg_id;
> -	PRFileDesc *sock;
> +	PRFileDesc *sock = NULL;
>  	PRSocketOptionData sockopt;
>  	PRNetAddr sa;
>-@@ -502,10 +504,10 @@
>+ 	PRFileDesc * newsock;
>+@@ -469,12 +471,12 @@ void
>+ tally_results(int verbose)
>  {
>  	int index;
> -	unsigned long tot_connect = 0;
>@@ -688,38 +1201,48 @@
> +	unsigned int tot_requests = 0;
>  
>  	fprintf(stdout, "Server results:\n\n");
>---- ../pr/tests/selct_nm.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/selct_nm.c	Mon Jul 25 21:21:56 2005
>-@@ -82,5 +82,5 @@
>+ 	for (index=0; index<_threads_max*2; index+=2) {
>+--- ../pr/tests/selct_nm.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/selct_nm.c	2015-11-04 02:02:20.447983000 +0000
>+@@ -45,7 +45,7 @@ PRIntn debug_mode;
>+ static void
>  clientThreadFunc(void *arg)
>  {
> -    PRUintn port = (PRUintn) arg;
> +    PRUintn port = (PRUintn)(uintptr_t)arg;
>      PRFileDesc *sock;
>      PRNetAddr addr;
>-@@ -202,5 +202,5 @@
>+     char buf[128];
>+@@ -165,7 +165,7 @@ failed_already=1;
>+     if (debug_mode) printf("%s", buf);
>  
>      clientThread = PR_CreateThread(PR_USER_THREAD,
> -	    clientThreadFunc, (void *) listenPort1,
> +	    clientThreadFunc, (void *)(uintptr_t)listenPort1,
>  	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>  	    PR_UNJOINABLE_THREAD, 0);
>-@@ -212,5 +212,5 @@
>+     if (clientThread == NULL) {
>+@@ -175,7 +175,7 @@ failed_already=1;
>+     }
>  
>      clientThread = PR_CreateThread(PR_USER_THREAD,
> -	    clientThreadFunc, (void *) listenPort2,
> +	    clientThreadFunc, (void *)(uintptr_t)listenPort2,
>  	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
>  	    PR_UNJOINABLE_THREAD, 0);
>---- ../pr/tests/select2.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/select2.c	Mon Jul 25 21:27:44 2005
>-@@ -86,4 +86,5 @@
>+     if (clientThread == NULL) {
>+--- ../pr/tests/select2.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/select2.c	2015-11-04 02:02:20.448561000 +0000
>+@@ -53,6 +53,7 @@ PRInt32 count;
>+ **      
>  ***********************************************************************/
>  
> +static int exitcode = 2;
>  
>  static void Test_Result (int result)
>-@@ -93,7 +94,10 @@
>+ {
>+@@ -60,9 +61,12 @@ static void Test_Result (int result)
>+ 	{
>  		case PASS:
>  			printf ("PASS\n");
> +			if (exitcode == 2)
>@@ -730,69 +1253,146 @@
> +			exitcode = 1;
>  			break;
>  		default:
>-@@ -352,3 +357,4 @@
>+ 			printf ("NOSTATUS\n");
>+@@ -319,4 +323,5 @@ int main(int argc, char **argv)
>+     PR_Cleanup();
>  
>  
> +    return exitcode;
>  }
>---- ../pr/tests/semaerr.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/semaerr.c	Mon Jul 25 21:29:23 2005
>-@@ -91,5 +91,5 @@
>+--- ../pr/tests/semaerr.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/semaerr.c	2015-11-04 02:02:20.449040000 +0000
>+@@ -65,7 +65,7 @@ int main(int argc, char **argv)
>+         exit(1);
>      }
>      if (PR_GetError() != PR_FILE_NOT_FOUND_ERROR) {
> -        fprintf(stderr, "Expected error is %d but got (%d, %d)\n",
> +        fprintf(stderr, "Expected error is %ld (PR_FILE_NOT_FOUND_ERROR) but got (%d, %d)\n",
>                  PR_FILE_NOT_FOUND_ERROR, PR_GetError(), PR_GetOSError());
>          exit(1);
>---- ../pr/tests/semaerr1.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/semaerr1.c	Mon Jul 25 21:30:25 2005
>-@@ -103,5 +103,5 @@
>+     }
>+--- ../pr/tests/semaerr1.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/semaerr1.c	2015-11-04 02:02:20.449526000 +0000
>+@@ -75,7 +75,7 @@ int main(int argc, char **argv)
>+         exit(1);
>      }
>      if (PR_GetError() != PR_FILE_EXISTS_ERROR) {
> -        fprintf(stderr, "Expect %d but got %d\n", PR_FILE_EXISTS_ERROR,
> +        fprintf(stderr, "Expected %ld (PR_FILE_EXISTS_ERROR) but got %d\n", PR_FILE_EXISTS_ERROR,
>                  PR_GetError());
>          exit(1);
>---- ../pr/tests/sendzlf.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/sendzlf.c	Mon Jul 25 21:31:35 2005
>-@@ -59,5 +59,5 @@
>+     }
>+--- ../pr/tests/sendzlf.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/sendzlf.c	2015-11-04 02:02:20.450064000 +0000
>+@@ -26,7 +26,7 @@ static void ClientThread(void *arg)
>+ {
>      PRFileDesc *sock;
>      PRNetAddr addr;
> -    PRUint16 port = (PRUint16) arg;
> +    PRUint16 port = (PRUint16)(uintptr_t)arg;
>      char buf[1024];
>      char *bufPtr;
>-@@ -217,5 +217,5 @@
>+     PRInt32 nbytes;
>+@@ -184,7 +184,7 @@ int main(int argc, char **argv)
>+     }
>  
>      clientThread = PR_CreateThread(PR_USER_THREAD,
> -            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
> +            ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)),
>              PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
>      if (NULL == clientThread) {
>---- ../pr/tests/servr_kk.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/servr_kk.c	Mon Jul 25 21:38:28 2005
>-@@ -90,5 +90,5 @@
>+         fprintf(stderr, "PR_CreateThread failed\n");
>+--- ../pr/tests/server_test.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/server_test.c	2015-11-04 02:02:20.464401000 +0000
>+@@ -60,7 +60,7 @@ PRCondVar *ServerStateCV;
>+ #ifdef DEBUGPRINTS
>+ #define DPRINTF printf
>+ #else
>+-#define DPRINTF
>++#define DPRINTF(...)
>+ #endif
>+ 
>+ 
>+@@ -502,6 +502,7 @@ static void do_workUU(void)
>+     do_work();
>+ }
>+ 
>++#if 0
>+ static void do_workUK(void)
>+ {
>+     ServerScope = PR_LOCAL_THREAD;
>+@@ -522,6 +523,7 @@ static void do_workKK(void)
>+     ClientScope = PR_GLOBAL_THREAD;
>+     do_work();
>+ }
>++#endif
>+ 
>+ 
>+ static void Measure(void (*func)(void), const char *msg)
>+--- ../pr/tests/servr_kk.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/servr_kk.c	2015-11-04 02:02:20.450733000 +0000
>+@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
>+ #ifdef DEBUGPRINTS
>  #define DPRINTF printf
>  #else
> -#define DPRINTF
> +#define DPRINTF(...)
>  #endif
>  
>-@@ -501,4 +501,5 @@
>+ PRIntn failed_already=0;
>+@@ -472,6 +472,7 @@ void do_work()
>+     PR_JoinThread(ServerThread);
>  }
>  
> +#if 0
>  static void do_workUU(void)
>  {
>-@@ -521,4 +522,5 @@
>+     ServerScope = PR_LOCAL_THREAD;
>+@@ -492,6 +493,7 @@ static void do_workKU(void)
>+     ClientScope = PR_LOCAL_THREAD;
>      do_work();
>  }
> +#endif
>  
>  static void do_workKK(void)
>---- ../pr/tests/short_thread.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/short_thread.c	Mon Jul 25 21:44:20 2005
>-@@ -76,6 +76,6 @@
>+ {
>+--- ../pr/tests/servr_ku.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/servr_ku.c	2015-11-04 02:02:20.465050000 +0000
>+@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
>+ #ifdef DEBUGPRINTS
>+ #define DPRINTF printf
>+ #else
>+-#define DPRINTF
>++#define DPRINTF(...)
>+ #endif
>+ 
>+ PRIntn failed_already=0;
>+--- ../pr/tests/servr_uk.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/servr_uk.c	2015-11-04 02:02:20.465699000 +0000
>+@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
>+ #ifdef DEBUGPRINTS
>+ #define DPRINTF printf
>+ #else
>+-#define DPRINTF
>++#define DPRINTF(...)
>+ #endif
>+ 
>+ PRIntn failed_already=0;
>+--- ../pr/tests/servr_uu.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/servr_uu.c	2015-11-04 02:02:20.466349000 +0000
>+@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
>+ #ifdef DEBUGPRINTS
>+ #define DPRINTF printf
>+ #else
>+-#define DPRINTF
>++#define DPRINTF(...)
>+ #endif
>+ 
>+ PRIntn failed_already=0;
>+--- ../pr/tests/short_thread.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/short_thread.c	2015-11-04 02:02:20.451202000 +0000
>+@@ -43,8 +43,8 @@ int main (int argc, char **argv)
>+ 						 PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0)) 
>  																		== NULL ) {
>  		fprintf(stderr,
> -			"simple_test: Error - PR_CreateThread failed: (%ld, %ld)\n",
>@@ -801,191 +1401,11 @@
> +						  PR_GetError(), PR_GetOSError());
>  		exit( 1 );
>  	}
>---- ../pr/tests/cvar2.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/cvar2.c	Mon Jul 25 20:37:10 2005
>-@@ -128,5 +128,5 @@
>-         PR_Lock(info->lock);
>-         if (*info->tcount == 0) {
>--	    DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n",
>-+	    DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n",
>- 				PR_GetCurrentThread(), info->cvar));
>-             PR_WaitCondVar(info->cvar, info->timeout);
>-@@ -141,6 +141,6 @@
>-         (*info->exitcount)++;
>-         PR_NotifyCondVar(info->exitcvar);
>--DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n",
>--			PR_GetCurrentThread(), info->exitcvar,(*info->exitcount)));
>-+DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n",
>-+			PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount)));
>-         PR_Unlock(info->exitlock);
>-     }
>-@@ -190,5 +190,5 @@
>- CondVarTestSUU(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -222,5 +222,5 @@
>-                          PR_LOCAL_THREAD);
>-         index++;
>--	DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread));
>-+	DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread));
>-     }
>- 
>-@@ -232,5 +232,5 @@
>-             PR_NotifyCondVar(list[index].cvar);
>-             PR_Unlock(list[index].lock);
>--	    DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n",
>-+	    DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n",
>- 				PR_GetCurrentThread(), list[index].cvar));
>-         }
>-@@ -260,5 +260,5 @@
>- CondVarTestSUK(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -334,5 +334,5 @@
>- CondVarTestPUU(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -369,5 +369,5 @@
>-                          PR_LOCAL_THREAD);
>- 
>--	DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread));
>-+	DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread));
>-         index++;
>- 	tcount++;
>-@@ -387,6 +387,6 @@
>-         /* Wait for threads to finish */
>-         while(exitcount < arg) {
>--DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n",
>--				PR_GetCurrentThread(), exitcvar, exitcount));
>-+DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n",
>-+				PR_GetCurrentThread(), exitcvar, (int)exitcount));
>-             	PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
>- 	}
>-@@ -398,5 +398,5 @@
>-     /* Join all the threads */
>-     for(index=0; index<(arg); index++)  {
>--	DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread));
>-+	DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread));
>-         PR_JoinThread(list[index].thread);
>-         if (list[index].internal) {
>-@@ -420,5 +420,5 @@
>- CondVarTestPUK(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -501,5 +501,5 @@
>- CondVarTest(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -634,5 +634,5 @@
>- CondVarTimeoutTest(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -745,5 +745,5 @@
>- CondVarMixedTest(void *_arg)
>- {
>--    PRInt32 arg = (PRInt32)_arg;
>-+    PRInt32 arg = (PRInt32)(intptr_t)_arg;
>-     PRInt32 index, loops;
>-     threadinfo *list;
>-@@ -835,5 +835,5 @@
>- 
>-             PR_Lock(list[index].lock);
>--            *list[index].tcount++;
>-+            list[index].tcount++;
>-             PR_NotifyCondVar(list[index].cvar);
>-             PR_Unlock(list[index].lock);
>-@@ -906,5 +906,5 @@
>- 
>-     start = PR_IntervalNow();
>--    (*func)((void *)arg);
>-+    (*func)((void *)(intptr_t)arg);
>-     stop = PR_IntervalNow();
>- 
>-@@ -965,5 +965,5 @@
>- 
>-     for (threads = default_threads; threads < default_threads*5; threads+=default_threads) {
>--        printf("\n%ld Thread tests\n", threads);
>-+        printf("\n%d Thread tests\n", (int)threads);
>-         Measure(CondVarTestSUU, threads, "Condvar simple test shared UU");
>-         Measure(CondVarTestSUK, threads, "Condvar simple test shared UK");
>---- ../pr/tests/io_timeout.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/io_timeout.c	Mon Jul 25 20:50:40 2005
>-@@ -55,9 +55,11 @@
>- #include "plgetopt.h"
>- 
>-+#include <errno.h>
>- #include <stdio.h>
>-+#include <string.h>
>- #include "nspr.h"
>- 
>- #define NUM_THREADS 1
>--#define BASE_PORT   8000
>-+#define BASE_PORT   38011
>- #define DEFAULT_ACCEPT_TIMEOUT 2
>- 
>-@@ -71,5 +73,5 @@
>- 
>- PRIntn failed_already = 0;
>--PRIntn debug_mode = 0;
>-+PRIntn debug_mode = 1;
>- 
>- #define	LOCAL_SCOPE_STRING			"LOCAL scope"
>-@@ -87,5 +89,5 @@
>-     PRStatus rv;
>- 	PRThreadScope tscope;
>--	char *scope_str;
>-+	const char *scope_str;
>- 
>-  
>-@@ -106,4 +108,5 @@
>- 		default:
>- 			PR_ASSERT(!"Invalid thread scope");
>-+			scope_str = NULL;
>- 			break;
>- 	}
>-@@ -124,5 +127,10 @@
>-     if (rv == PR_FAILURE) {
>- 		if (debug_mode)
>--        	printf("unable to bind\n");
>-+			printf("unable to bind to %d: %s\n",
>-+			    BASE_PORT + info->id, strerror(PR_GetOSError()));
>-+		if (PR_GetOSError() == EADDRINUSE) {
>-+			printf("can not proceed with this test\n");
>-+			exit(0);
>-+		}
>- 		failed_already=1;
>-         goto dead;
>-@@ -146,6 +154,7 @@
>-         if (PR_GetError() == PR_IO_TIMEOUT_ERROR) {
>- 			if (debug_mode) {	
>--            	printf("PR_Accept() timeout worked!\n"); 
>--				printf("TEST PASSED! PR_Accept() returned error %d\n",
>-+				printf("PR_Accept() timeout worked!\n"
>-+				    "TEST PASSED! PR_Accept() returned error "
>-+				    "PR_IO_TIMEOUT_ERROR (%ld)\n",
>- 							PR_IO_TIMEOUT_ERROR);
>- 			}
>---- ../pr/tests/socket.c	2009-05-06 01:40:39.000000000 -0400
>-+++ ../pr/tests/socket.c	2009-11-04 16:45:41.000000000 -0500
>-@@ -132,11 +132,13 @@
>+ 	PR_Cleanup();
>+--- ../pr/tests/socket.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/socket.c	2015-11-04 02:02:20.454777000 +0000
>+@@ -103,13 +103,15 @@ char *LARGE_FILE_NAME = "/tmp/prsocket_t
>+ #endif
>  
>  static PRInt32 num_tcp_clients = NUM_TCP_CLIENTS;
> -static PRInt32 num_udp_clients = NUM_UDP_CLIENTS;
>@@ -1000,7 +1420,9 @@
> +#endif
>  
>  static PRInt32 thread_count;
>-@@ -210,5 +212,7 @@
>+ PRUint16 server_domain = PR_AF_INET, client_domain = PR_AF_INET;
>+@@ -181,19 +183,23 @@ readn(PRFileDesc *sockfd, char *buf, int
>+     int rem;
>      int bytes;
>      int offset = 0;
> +#ifdef WINNT
>@@ -1008,7 +1430,8 @@
> +#endif
>  	PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
>  
>-@@ -217,10 +221,12 @@
>+ 	if (test_cancelio)
>+ 		timeout = PR_SecondsToInterval(2);
>  
>      for (rem=len; rem; offset += bytes, rem -= bytes) {
> -        DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n",
>@@ -1023,7 +1446,9 @@
> +        DPRINTF(("thread = %p: returning from PR_Recv, bytes = %d\n",
>              PR_GetCurrentThread(), bytes));
>          if (bytes < 0) {
>-@@ -253,9 +259,9 @@
>+ #ifdef WINNT
>+@@ -224,11 +230,11 @@ writen(PRFileDesc *sockfd, char *buf, in
>+     int offset = 0;
>  
>      for (rem=len; rem; offset += bytes, rem -= bytes) {
> -        DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n",
>@@ -1035,35 +1460,45 @@
> +        DPRINTF(("thread = %p: returning from PR_Send, bytes = %d\n",
>              PR_GetCurrentThread(), bytes));
>          if (bytes <= 0)
>-@@ -308,5 +314,5 @@
>+             return -1;
>+@@ -279,7 +285,7 @@ Serve_Client(void *arg)
>+                 fprintf(stderr,"prsocket_test: ERROR - PR_Shutdown\n");
>              }
>  #endif
> -        DPRINTF(("Serve_Client [0x%lx]: inbuf[0] = 0x%lx\n",PR_GetCurrentThread(),
> +        DPRINTF(("Serve_Client [%p]: inbuf[0] = %d\n",PR_GetCurrentThread(),
>              (*((int *) in_buf->data))));
>          if (writen(sockfd, in_buf->data, bytes) < bytes) {
>-@@ -447,5 +453,5 @@
>+             fprintf(stderr,"prsocket_test: ERROR - Serve_Client:writen\n");
>+@@ -418,7 +424,7 @@ TCP_Server(void *arg)
>+         goto exit;
>      }
>  
> -    DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
> +    DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n",
>          netaddr.inet.ip, netaddr.inet.port));
>  	if (PR_SetNetAddr(PR_IpAddrLoopback, client_domain,
>-@@ -489,5 +495,5 @@
>+ 									PR_ntohs(PR_NetAddrInetPort(&netaddr)),
>+@@ -460,7 +466,7 @@ TCP_Server(void *arg)
>+         scp->datalen = sp->datalen;
>  
>          t = create_new_thread(PR_USER_THREAD,
> -            Serve_Client, (void *)scp, 
> +            Serve_Client, (void *)scp,
>              PR_PRIORITY_NORMAL,
>              PR_LOCAL_THREAD,
>-@@ -499,5 +505,5 @@
>+             PR_UNJOINABLE_THREAD,
>+@@ -470,7 +476,7 @@ TCP_Server(void *arg)
>+             failed_already=1;
>              goto exit;
>          }
> -        DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", t));
> +        DPRINTF(("TCP_Server: Created Serve_Client = %p\n", t));
>      }
>  
>-@@ -515,7 +521,8 @@
>+ exit:
>+@@ -486,9 +492,10 @@ exit:
>+     --(*sp->exit_counter);
>      PR_Notify(sp->exit_mon);
>      PR_ExitMonitor(sp->exit_mon);
> -    DPRINTF(("TCP_Server [0x%lx] exiting\n", PR_GetCurrentThread()));
>@@ -1073,28 +1508,34 @@
> +#if defined(SYMBIAN) && !defined(__WINSCW__)
>  /*
>   * UDP Server
>-@@ -573,5 +580,5 @@
>+  *    Server Thread
>+@@ -544,7 +551,7 @@ UDP_Server(void *arg)
>+         return;
>      }
>  
> -    DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
> +    DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n",
>          netaddr.inet.ip, netaddr.inet.port));
>      /*
>-@@ -611,5 +618,5 @@
>+      * We can't use the IP address returned by PR_GetSockName in
>+@@ -582,13 +589,13 @@ UDP_Server(void *arg)
>+      */
>      memset(&netaddr, 0 , sizeof(netaddr));
>      for (i = 0; i < (num_udp_clients * num_udp_datagrams_per_client); i++) {
> -        DPRINTF(("UDP_Server: calling PR_RecvFrom client  - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n",
> +        DPRINTF(("UDP_Server: calling PR_RecvFrom client  - ip = 0x%x, port = %d bytes = %d inbuf = %p, inbuf[0] = 0x%x\n",
>              netaddr.inet.ip, netaddr.inet.port, bytes, in_buf->data,
>              in_buf->data[0]));
>-@@ -617,5 +624,5 @@
>+ 
>          rv = PR_RecvFrom(sockfd, in_buf->data, bytes, 0, &netaddr,
>              PR_INTERVAL_NO_TIMEOUT);
> -        DPRINTF(("UDP_Server: PR_RecvFrom client  - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n",
> +        DPRINTF(("UDP_Server: PR_RecvFrom client  - ip = 0x%x, port = %d bytes = %d inbuf = %p, inbuf[0] = 0x%x\n",
>              netaddr.inet.ip, netaddr.inet.port, rv, in_buf->data,
>              in_buf->data[0]));
>-@@ -640,6 +647,7 @@
>+         if (rv != bytes) {
>+@@ -611,8 +618,9 @@ UDP_Server(void *arg)
>+     --(*sp->exit_counter);
>      PR_Notify(sp->exit_mon);
>      PR_ExitMonitor(sp->exit_mon);
> -    DPRINTF(("UDP_Server [0x%x] exiting\n", PR_GetCurrentThread()));
>@@ -1103,28 +1544,36 @@
> +#endif /* defined(SYMBIAN) && !defined(__WINSCW__) */
>  
>  /*
>-@@ -684,5 +692,5 @@
>+  * TCP_Client
>+@@ -655,7 +663,7 @@ TCP_Client(void *arg)
>+         }
>          if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){
>          	fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n",
> -            		PR_GetError(), PR_GetOSError());
> +            		(long)PR_GetError(), (long)PR_GetOSError());
>              failed_already=1;
>              return;
>-@@ -692,5 +700,5 @@
>+         }
>+@@ -663,7 +671,7 @@ TCP_Client(void *arg)
>+             /*
>               * fill in random data
>               */
> -            memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes);
> +            memset(out_buf->data, ((intptr_t)(&netaddr)) + i + j, bytes);
>              /*
>               * write to server
>-@@ -705,5 +713,5 @@
>+              */
>+@@ -676,7 +684,7 @@ TCP_Client(void *arg)
>+                 failed_already=1;
>                  return;
>              }
> -            DPRINTF(("TCP Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n",
> +            DPRINTF(("TCP Client [%p]: out_buf = %p out_buf[0] = 0x%x\n",
>                  PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data))));
>              if (readn(sockfd, in_buf->data, bytes) < bytes) {
>-@@ -745,11 +753,12 @@
>+                 fprintf(stderr,"prsocket_test: ERROR - TCP_Client:readn\n");
>+@@ -716,13 +724,14 @@ TCP_Client(void *arg)
>+     --(*cp->exit_counter);
>      PR_Notify(cp->exit_mon);
>      PR_ExitMonitor(cp->exit_mon);
> -    DPRINTF(("TCP_Client [0x%x] exiting\n", PR_GetCurrentThread()));
>@@ -1139,14 +1588,18 @@
> + *    Create a socket and bind an address
>   *    Communicate with the server at the address specified in the argument.
>   *    Fill in a buffer, write data to server, read it back and check
>-@@ -809,5 +818,5 @@
>+  *    for data corruption.
>+@@ -780,7 +789,7 @@ UDP_Client(void *arg)
>+         return;
>      }
>  
> -    DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
> +    DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n",
>          netaddr.inet.ip, netaddr.inet.port));
>  
>-@@ -826,7 +835,7 @@
>+     netaddr = cp->server_addr;
>+@@ -797,9 +806,9 @@ UDP_Client(void *arg)
>+         /*
>           * fill in random data
>           */
> -        DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx bytes = 0x%lx\n",
>@@ -1156,21 +1609,27 @@
> +        memset(out_buf->data, ((intptr_t)(&netaddr)) + i, bytes);
>          /*
>           * write to server
>-@@ -841,5 +850,5 @@
>+          */
>+@@ -812,7 +821,7 @@ UDP_Client(void *arg)
>+         if (rv != bytes) {
>              return;
>          }
> -        DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n",
> +        DPRINTF(("UDP_Client [%p]: out_buf = %p out_buf[0] = 0x%x\n",
>              PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data))));
>          if (cp->udp_connect)
>-@@ -852,5 +861,5 @@
>+             rv = PR_Recv(sockfd, in_buf->data, bytes, 0,
>+@@ -823,7 +832,7 @@ UDP_Client(void *arg)
>+         if (rv != bytes) {
>              return;
>          }
> -        DPRINTF(("UDP_Client [0x%lx]: in_buf = 0x%lx in_buf[0] = 0x%lx\n",
> +        DPRINTF(("UDP_Client [%p]: in_buf = %p in_buf[0] = 0x%x\n",
>              PR_GetCurrentThread(), in_buf, (*((int *) in_buf->data))));
>          /*
>-@@ -877,10 +886,11 @@
>+          * verify the data read
>+@@ -848,12 +857,13 @@ UDP_Client(void *arg)
>+     PR_Notify(cp->exit_mon);
>      PR_ExitMonitor(cp->exit_mon);
>      PR_DELETE(cp);
> -    DPRINTF(("UDP_Client [0x%x] exiting\n", PR_GetCurrentThread()));
>@@ -1184,28 +1643,36 @@
> + *
>   *    One server and several clients are started
>   *    Each client connects to the server and sends a chunk of data
>-@@ -934,5 +944,5 @@
>+  *    For each connection, server starts another thread to read the data
>+@@ -905,7 +915,7 @@ TCP_Socket_Client_Server_Test(void)
>+     sparamp->exit_counter = &thread_count;
>      sparamp->datalen = datalen;
>      t = PR_CreateThread(PR_USER_THREAD,
> -        TCP_Server, (void *)sparamp, 
> +        TCP_Server, (void *)sparamp,
>          PR_PRIORITY_NORMAL,
>          PR_LOCAL_THREAD,
>-@@ -944,5 +954,5 @@
>+         PR_UNJOINABLE_THREAD,
>+@@ -915,7 +925,7 @@ TCP_Socket_Client_Server_Test(void)
>+         failed_already=1;
>          return -1;
>      }
> -    DPRINTF(("Created TCP server = 0x%lx\n", t));
> +    DPRINTF(("Created TCP server = %p\n", t));
>      thread_count++;
>  
>-@@ -978,5 +988,5 @@
>+     /*
>+@@ -949,7 +959,7 @@ TCP_Socket_Client_Server_Test(void)
>+             failed_already=1;
>              return -1;
>          }
> -        DPRINTF(("Created TCP client = 0x%lx\n", t));
> +        DPRINTF(("Created TCP client = %p\n", t));
>          thread_count++;
>      }
>-@@ -988,7 +998,7 @@
>+     /* Wait for server and client threads to exit */
>+@@ -959,17 +969,18 @@ TCP_Socket_Client_Server_Test(void)
>+     }
>      PR_ExitMonitor(mon2);
>      printf("%30s","TCP_Socket_Client_Server_Test:");
> -    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
>@@ -1215,7 +1682,7 @@
> +    printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":",
>          num_tcp_mesgs_per_connection, tcp_mesg_size);
>  
>-@@ -996,7 +1006,8 @@
>+     return 0;
>  }
>  
> +#if defined(SYMBIAN) && !defined(__WINSCW__)
>@@ -1225,14 +1692,18 @@
> + *
>   *    One server and several clients are started
>   *    Each client connects to the server and sends a chunk of data
>-@@ -1052,5 +1063,5 @@
>+  *    For each connection, server starts another thread to read the data
>+@@ -1023,7 +1034,7 @@ UDP_Socket_Client_Server_Test(void)
>+     sparamp->datalen = datalen;
>      DPRINTF(("Creating UDP server"));
>      t = PR_CreateThread(PR_USER_THREAD,
> -        UDP_Server, (void *)sparamp, 
> +        UDP_Server, (void *)sparamp,
>          PR_PRIORITY_NORMAL,
>          PR_LOCAL_THREAD,
>-@@ -1113,10 +1124,11 @@
>+         PR_UNJOINABLE_THREAD,
>+@@ -1084,12 +1095,13 @@ UDP_Socket_Client_Server_Test(void)
>+     }
>      PR_ExitMonitor(mon2);
>      printf("%30s","UDP_Socket_Client_Server_Test: ");
> -    printf("%2ld Server %2ld Clients\n",1l, num_udp_clients);
>@@ -1246,105 +1717,135 @@
> +#endif /* defined(SYMBIAN) && !defined(__WINSCW__) */
>  
>  static PRFileDesc *small_file_fd, *large_file_fd;
>-@@ -1470,5 +1482,5 @@
>+ static void *small_file_addr, *small_file_header, *large_file_addr;
>+@@ -1441,7 +1453,7 @@ TransmitFile_Client(void *arg)
>+     --(*cp->exit_counter);
>      PR_Notify(cp->exit_mon);
>      PR_ExitMonitor(cp->exit_mon);
> -    DPRINTF(("TransmitFile_Client [0x%lx] exiting\n", PR_GetCurrentThread()));
> +    DPRINTF(("TransmitFile_Client [%p] exiting\n", PR_GetCurrentThread()));
>  }
>  
>-@@ -1513,5 +1525,5 @@
>+ /*
>+@@ -1484,7 +1496,7 @@ Serve_TransmitFile_Client(void *arg)
>+     if (bytes != (SMALL_FILE_SIZE+ SMALL_FILE_HEADER_SIZE)) {
>          fprintf(stderr,
>              "prsocet_test: PR_TransmitFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1521,5 +1533,5 @@
>+     bytes = PR_TransmitFile(sockfd, local_large_file_fd, NULL, 0,
>+@@ -1492,7 +1504,7 @@ Serve_TransmitFile_Client(void *arg)
>+     if (bytes != LARGE_FILE_SIZE) {
>          fprintf(stderr,
>              "prsocket_test: PR_TransmitFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1549,5 +1561,5 @@
>+ 
>+@@ -1520,7 +1532,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1573,5 +1585,5 @@
>+ 
>+@@ -1544,7 +1556,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1595,5 +1607,5 @@
>+ 	/*
>+@@ -1566,7 +1578,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1617,5 +1629,5 @@
>+ 	/*
>+@@ -1588,7 +1600,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1639,5 +1651,5 @@
>+ 	/*
>+@@ -1610,7 +1622,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1661,5 +1673,5 @@
>+ 	/*
>+@@ -1632,7 +1644,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1683,5 +1695,5 @@
>+ 	/*
>+@@ -1654,7 +1666,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1707,5 +1719,5 @@
>+ 	/*
>+@@ -1678,7 +1690,7 @@ Serve_TransmitFile_Client(void *arg)
>+ 									slen, bytes);
>          fprintf(stderr,
>              "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
> -            PR_GetError(), PR_GetOSError());
> +            (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>-@@ -1781,5 +1793,5 @@
>+ done:
>+@@ -1752,7 +1764,7 @@ TransmitFile_Server(void *arg)
>+         goto exit;
>      }
>  
> -    DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
> +    DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n",
>          netaddr.inet.ip, netaddr.inet.port));
>      tcp_server_addr.inet.family = netaddr.inet.family;
>-@@ -1836,5 +1848,5 @@
>+     tcp_server_addr.inet.port = netaddr.inet.port;
>+@@ -1807,7 +1819,7 @@ TransmitFile_Server(void *arg)
>+         scp->datalen = sp->datalen;
>  
>          t[i] = PR_CreateThread(PR_USER_THREAD,
> -            Serve_TransmitFile_Client, (void *)scp, 
> +            Serve_TransmitFile_Client, (void *)scp,
>              PR_PRIORITY_NORMAL,
>              PR_LOCAL_THREAD,
>-@@ -1847,5 +1859,5 @@
>+             PR_JOINABLE_THREAD,
>+@@ -1818,7 +1830,7 @@ TransmitFile_Server(void *arg)
>+             failed_already=1;
>              goto exit;
>          }
> -        DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = 0x%lx\n", t));
> +        DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = %p\n", t));
>      }
>  
>-@@ -1875,10 +1887,10 @@
>+     /*
>+@@ -1846,12 +1858,12 @@ exit:
>+     --(*sp->exit_counter);
>      PR_Notify(sp->exit_mon);
>      PR_ExitMonitor(sp->exit_mon);
> -    DPRINTF(("TransmitFile_Server [0x%lx] exiting\n", PR_GetCurrentThread()));
>@@ -1358,69 +1859,86 @@
> + *
>   */
>  static PRInt32
>-@@ -2015,5 +2027,5 @@
>+ Socket_Misc_Test(void)
>+@@ -1986,7 +1998,7 @@ Socket_Misc_Test(void)
>+             fprintf(stderr,
>                  "prsocket_test failed to write to file %s: (%ld, %ld)\n",
>                  LARGE_FILE_NAME,
> -                PR_GetError(), PR_GetOSError());
> +                (long)PR_GetError(), (long)PR_GetOSError());
>              failed_already=1;
>              rv = -1;
>-@@ -2094,5 +2106,5 @@
>+             goto done;
>+@@ -2065,7 +2077,7 @@ Socket_Misc_Test(void)
>+     sparamp->exit_counter = &thread_count;
>      sparamp->datalen = datalen;
>      t = PR_CreateThread(PR_USER_THREAD,
> -        TransmitFile_Server, (void *)sparamp, 
> +        TransmitFile_Server, (void *)sparamp,
>          PR_PRIORITY_NORMAL,
>          PR_LOCAL_THREAD,
>-@@ -2105,5 +2117,5 @@
>+         PR_UNJOINABLE_THREAD,
>+@@ -2076,7 +2088,7 @@ Socket_Misc_Test(void)
>+         rv = -1;
>          goto done;
>      }
> -    DPRINTF(("Created TCP server = 0x%x\n", t));
> +    DPRINTF(("Created TCP server = %p\n", t));
>      thread_count++;
>  
>-@@ -2142,5 +2154,5 @@
>+     /*
>+@@ -2113,7 +2125,7 @@ Socket_Misc_Test(void)
>+             failed_already=1;
>              goto done;
>          }
> -        DPRINTF(("Created TransmitFile client = 0x%lx\n", t));
> +        DPRINTF(("Created TransmitFile client = %p\n", t));
>          thread_count++;
>      }
>-@@ -2173,5 +2185,5 @@
>+     /* Wait for server and client threads to exit */
>+@@ -2144,7 +2156,7 @@ done:
>+     }
>      if ((PR_RmDir(TEST_DIR)) == PR_FAILURE) {
>          fprintf(stderr,"prsocket_test failed to rmdir %s: (%ld, %ld)\n",
> -            TEST_DIR, PR_GetError(), PR_GetOSError());
> +            TEST_DIR, (long)PR_GetError(), (long)PR_GetOSError());
>          failed_already=1;
>      }
>---- ../pr/tests/sprintf.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/sprintf.c	Mon Jul 25 22:21:32 2005
>-@@ -162,5 +162,5 @@
>+ 
>+--- ../pr/tests/sprintf.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/sprintf.c	2015-11-04 02:02:20.455364000 +0000
>+@@ -127,7 +127,7 @@ static void test_l(char *pattern, char *
>+ 	(strncmp(s, sbuf, sizeof(sbuf)) != 0)) {
>  	fprintf(stderr,
>  	   "pattern='%s' l=%ld\nPR_smprintf='%s'\nPR_snprintf='%s'\n    sprintf='%s'\n",
> -	   pattern, l, s, buf, sbuf);
> +	   pattern, (long)l, s, buf, sbuf);
>  	PR_smprintf_free(s);
>  	exit(-1);
>---- ../pr/tests/stack.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/stack.c	Mon Jul 25 22:22:43 2005
>-@@ -86,5 +86,5 @@
>- PRIntn main(PRIntn argc, char **argv)
>+     }
>+--- ../pr/tests/stack.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/stack.c	2015-11-04 02:02:20.455937000 +0000
>+@@ -54,7 +54,7 @@ PRFileDesc  *errhandle;
>+ int main(int argc, char **argv)
>  {
>+ #if !(defined(SYMBIAN) && defined(__WINS__))
> -    PRInt32 rv, cnt, sum;
> +    PRInt32 cnt, sum;
>  	DataRecord	*Item;
>  	PRStack		*list1, *list2;
>-@@ -240,5 +240,5 @@
>+ 	PRStackElem	*node;
>+@@ -209,7 +209,7 @@ int main(int argc, char **argv)
>+ static void stackop(void *thread_arg)
>  {
>      PRInt32 val, cnt, index, loops;
> -	DataRecord	*Items, *Item;
> +	DataRecord	*Items;
>  	PRStack		*list1, *list2;
>  	PRStackElem	*node;
>---- ../pr/tests/suspend.c.orig	2010-09-24 20:14:40.000000000 +0200
>-+++ ../pr/tests/suspend.c	2011-01-15 13:56:43.000000000 +0100
>-@@ -62,14 +62,14 @@
>+ 	stack_data *arg = (stack_data *) thread_arg;
>+--- ../pr/tests/suspend.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/suspend.c	2015-11-04 02:02:20.456555000 +0000
>+@@ -30,14 +30,14 @@ void PR_CALLBACK
>  Level_2_Thread(void *arg)
>  {
>      PR_Sleep(PR_MillisecondsToInterval(4 * 1000));
>@@ -1437,7 +1955,7 @@
>      PRThreadScope scope = (PRThreadScope) tmp;
>      PRThread *thr;
>  
>-@@ -84,7 +84,7 @@
>+@@ -52,7 +52,7 @@ Level_1_Thread(void *arg)
>      if (!thr) {
>          printf("Could not create thread!\n");
>      } else {
>@@ -1446,7 +1964,7 @@
>              PR_GetCurrentThread(),
>              (scope == PR_GLOBAL_THREAD) ?
>              "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD",
>-@@ -95,7 +95,7 @@
>+@@ -63,7 +63,7 @@ Level_1_Thread(void *arg)
>      alive--;
>      PR_Notify(mon);
>      PR_ExitMonitor(mon);
>@@ -1455,7 +1973,7 @@
>  }
>  
>  static PRStatus PR_CALLBACK print_thread(PRThread *thread, int i, void *arg)
>-@@ -104,14 +104,15 @@
>+@@ -72,14 +72,15 @@ static PRStatus PR_CALLBACK print_thread
>      PRWord *registers;
>  
>      printf(
>@@ -1475,7 +1993,7 @@
>      return PR_SUCCESS;
>  }
>  
>-@@ -139,7 +140,7 @@
>+@@ -107,7 +108,7 @@ static void Level_0_Thread(PRThreadScope
>              printf("Could not create thread!\n");
>              alive--;
>          }
>@@ -1484,7 +2002,7 @@
>              PR_GetCurrentThread(),
>              (scope1 == PR_GLOBAL_THREAD) ?
>              "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD",
>-@@ -151,9 +152,10 @@
>+@@ -119,9 +120,10 @@ static void Level_0_Thread(PRThreadScope
>      PR_EnumerateThreads(print_thread, NULL);
>      registers = PR_GetGCRegisters(me, 1, (int *)&words);
>      if (registers)
>@@ -1498,9 +2016,21 @@
>      PR_ResumeAll();
>  
>      /* Wait for all threads to exit */
>---- ../pr/tests/testfile.c	Tue Jun 20 17:46:54 2000
>-+++ ../pr/tests/testfile.c	Mon Jul 25 22:36:39 2005
>-@@ -69,4 +69,7 @@
>+--- ../pr/tests/switch.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/switch.c	2015-11-04 02:02:20.469217000 +0000
>+@@ -80,7 +80,7 @@ PRIntn PR_CALLBACK Switch(PRIntn argc, c
>+     PRStatus status;
>+     PRBool help = PR_FALSE;
>+     PRUintn concurrency = 1;
>+-    Shared *shared, *link;
>++    Shared *shared = NULL, *link;
>+     PRIntervalTime timein, timeout;
>+     PRThreadScope thread_scope = PR_LOCAL_THREAD;
>+     PRUintn thread_count, inner_count, loop_count, average;
>+--- ../pr/tests/testfile.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/testfile.c	2015-11-04 02:02:20.457379000 +0000
>+@@ -36,6 +36,9 @@ static int _debug_on = 0;
>+ #ifdef XP_WIN
>  #define mode_t int
>  #endif
> +#if defined(XP_UNIX) || defined(XP_OS2_EMX)
>@@ -1508,21 +2038,27 @@
> +#endif
>  
>  #define DPRINTF(arg) if (_debug_on) printf arg
>-@@ -119,5 +122,5 @@
>+ 
>+@@ -93,7 +96,7 @@ static PRInt32 PR_CALLBACK DirTest(void 
>+ PRInt32 dirtest_failed = 0;
>  
>  PRThread* create_new_thread(PRThreadType type,
> -							void (*start)(void *arg),
> +							void *(*start)(void *arg),
>  							void *arg,
>  							PRThreadPriority priority,
>-@@ -181,5 +184,5 @@
>+ 							PRThreadScope scope,
>+@@ -155,7 +158,7 @@ PRInt32 native_thread = 0;
>+ 		return((PRThread *) thandle);
>  #endif
>  	} else {
> -		return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize));
> +		return(PR_CreateThread(type,(void (*)(void*))start,arg,priority,scope,state,stackSize));
>  	}
>  #else
>-@@ -342,6 +345,6 @@
>+ 	return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize));
>+@@ -316,8 +319,8 @@ char tmpname[1024];
>+ 		printf(
>  		"testfile PR_GetFileInfo returned incorrect status-change time: %s\n",
>  		pathname);
> -		printf("ft = %lld, ft1 = %lld\n",file_info.creationTime,
>@@ -1531,7 +2067,9 @@
> +			(long long)file_info1.creationTime);
>  		rv = -1;
>  		goto cleanup;
>-@@ -368,6 +371,6 @@
>+ 	}
>+@@ -342,8 +345,8 @@ char tmpname[1024];
>+ 		printf(
>  		"testfile PR_GetFileInfo returned incorrect modify time: %s\n",
>  		pathname);
> -		printf("ft = %lld, ft1 = %lld\n",file_info.modifyTime,
>@@ -1540,77 +2078,73 @@
> +			(long long)file_info1.modifyTime);
>  		rv = -1;
>  		goto cleanup;
>-@@ -495,5 +498,5 @@
>+ 	}
>+@@ -469,7 +472,7 @@ File_Rdwr_Param *fparamp;
>+ 		memset(fparamp->buf, i, len);
>  
>  		t = create_new_thread(PR_USER_THREAD,
> -			      File_Write, (void *)fparamp, 
> +			      (void *(*)(void *))File_Write, (void *)fparamp, 
>  			      PR_PRIORITY_NORMAL,
>  			      scope,
>-@@ -530,5 +533,5 @@
>+ 			      PR_UNJOINABLE_THREAD,
>+@@ -504,7 +507,7 @@ File_Rdwr_Param *fparamp;
>+ 		fparamp->len = len;
>  
>  		t = create_new_thread(PR_USER_THREAD,
> -			      File_Read, (void *)fparamp, 
> +			      (void *(*)(void *))File_Read, (void *)fparamp, 
>  			      PR_PRIORITY_NORMAL,
>  			      scope,
>-@@ -598,5 +601,5 @@
>+ 			      PR_UNJOINABLE_THREAD,
>+@@ -572,7 +575,7 @@ struct dirtest_arg thrarg;
>+ 
>  		thrarg.done= 0;
>  		t = create_new_thread(PR_USER_THREAD,
> -			      DirTest, &thrarg, 
>-+			      (void *(*)(void *))DirTest, &thrarg, 
>- 			      PR_PRIORITY_NORMAL,
>- 			      PR_LOCAL_THREAD,
>-@@ -953,6 +956,4 @@
>- #if defined(XP_UNIX) || defined(XP_OS2_EMX)
>-         int opt;
>--        extern char *optarg;
>--	extern int optind;
>- #endif
>- #if defined(XP_UNIX) || defined(XP_OS2_EMX)
>---- ../pr/tests/thrpool_server.c	2009-05-06 01:40:39.000000000 -0400
>-+++ ../pr/tests/thrpool_server.c	2009-11-04 16:53:49.000000000 -0500
>-@@ -351,5 +351,5 @@
>- 
>-     DPRINTF((
>--	"TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
>-+	"TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n",
>-         netaddr.inet.ip, netaddr.inet.port));
>- 
>-@@ -363,5 +363,5 @@
>- 	sp->iod.timeout = PR_SecondsToInterval(60);
>- 	sp->datalen = tcp_mesg_size;
>--	sp->exit_mon = sc_mon;
>-+	sp->exit_mon = NULL;
>- 	sp->job_counterp = &job_counter;
>- 	sp->conn_counter = 0;
>-@@ -486,5 +486,5 @@
>- 
>- 	PR_ASSERT(NULL != jobp);
>--	DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", jobp));
>-+	DPRINTF(("TCP_Server: Created Serve_Client = %p\n", jobp));
>- 
>- 	/*
>-@@ -503,5 +503,5 @@
>++			      (void *(*)(void *))DirTest, &thrarg, 
>+ 			      PR_PRIORITY_NORMAL,
>+ 			      PR_LOCAL_THREAD,
>+ 			      PR_UNJOINABLE_THREAD,
>+@@ -895,8 +898,6 @@ int main(int argc, char **argv)
>+ #endif
>+ #if defined(XP_UNIX) || defined(XP_OS2)
>+         int opt;
>+-        extern char *optarg;
>+-	extern int optind;
>+ #endif
>+ #if defined(XP_UNIX) || defined(XP_OS2)
>+         while ((opt = getopt(argc, argv, "d")) != EOF) {
>+--- ../pr/tests/threads.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/threads.c	2015-11-04 02:02:20.459183000 +0000
>+@@ -27,7 +27,7 @@ void
>+ PR_CALLBACK
>+ DumbThread(void *arg)
>+ {
>+-    PRInt32 tmp = (PRInt32)arg;
>++    PRInt32 tmp = (PRInt32)(intptr_t)arg;
>+     PRThreadScope scope = (PRThreadScope)tmp;
>+     PRThread *thr;
>  
>- 	PR_ASSERT(NULL != jobp);
>--	DPRINTF(("TCP_Server: Created print_stats timer job = 0x%lx\n", jobp));
>-+	DPRINTF(("TCP_Server: Created print_stats timer job = %p\n", jobp));
>+@@ -167,10 +167,10 @@ int main(int argc, char **argv)
>  
>- exit:
>-@@ -520,7 +520,7 @@
>- 	PR_DestroyMonitor(sp->exit_mon);
>-     printf("%30s","TCP_Socket_Client_Server_Test:");
>--    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
>-+    printf(" 1 Server %2d Clients %2d connections_per_client\n",
>-         num_tcp_clients, num_tcp_connections_per_client);
>--    printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":",
>-+    printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":",
>-         num_tcp_mesgs_per_connection, tcp_mesg_size);
>+     if (debug_mode)
>+     {
>+-    printf("\
>+-** Tests lots of thread creations.  \n\
>+-** Create %ld native threads %ld times. \n\
>+-** Create %ld user threads %ld times \n", iterations,count,iterations,count);
>++    printf("** Tests lots of thread creations.\n"
>++	"** Create %d native threads %d times.\n"
>++	"** Create %d user threads %d times.\n", iterations, count,
>++	iterations, count);
>+     }
>  
>---- ../pr/tests/thrpool_client.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/thrpool_client.c	Mon Jul 25 22:40:45 2005
>-@@ -127,9 +127,9 @@
>+     for (index=0; index<iterations; index++) {
>+--- ../pr/tests/thrpool_client.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/thrpool_client.c	2015-11-04 02:02:20.458656000 +0000
>+@@ -82,11 +82,11 @@ readn(PRFileDesc *sockfd, char *buf, int
>+ 	PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
>  
>      for (rem=len; rem; offset += bytes, rem -= bytes) {
> -        DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n",
>@@ -1622,7 +2156,9 @@
> +        DPRINTF(("thread = %p: returning from PR_Recv, bytes = %d\n",
>              PR_GetCurrentThread(), bytes));
>          if (bytes < 0) {
>-@@ -152,9 +152,9 @@
>+ 			return -1;
>+@@ -107,11 +107,11 @@ writen(PRFileDesc *sockfd, char *buf, in
>+     int offset = 0;
>  
>      for (rem=len; rem; offset += bytes, rem -= bytes) {
> -        DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n",
>@@ -1634,28 +2170,36 @@
> +        DPRINTF(("thread = %p: returning from PR_Send, bytes = %d\n",
>              PR_GetCurrentThread(), bytes));
>          if (bytes <= 0)
>-@@ -209,5 +209,5 @@
>+             return -1;
>+@@ -164,7 +164,7 @@ TCP_Client(void *arg)
>+ 
>          DPRINTF(("TCP client connecting to server:%d\n", server_port));
>          if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){
> -        	fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n",
> +        	fprintf(stderr, "PR_Connect failed: (%d, %d)\n",
>              		PR_GetError(), PR_GetOSError());
>              failed_already=1;
>-@@ -218,5 +218,5 @@
>+             return;
>+@@ -173,7 +173,7 @@ TCP_Client(void *arg)
>+             /*
>               * fill in random data
>               */
> -            memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes);
> +            memset(out_buf->data, ((intptr_t)(&netaddr)) + i + j, bytes);
>              /*
>               * write to server
>-@@ -326,5 +326,5 @@
>+              */
>+@@ -281,7 +281,7 @@ TCP_Socket_Client_Server_Test(void)
>+     	PR_EnterMonitor(mon2);
>          connections++;
>      	PR_ExitMonitor(mon2);
> -        DPRINTF(("Created TCP client = 0x%lx\n", thr));
> +        DPRINTF(("Created TCP client = %p\n", thr));
>      }
>      /* Wait for client jobs to exit */
>-@@ -336,7 +336,7 @@
>+     PR_EnterMonitor(mon2);
>+@@ -291,9 +291,9 @@ TCP_Socket_Client_Server_Test(void)
>+     }
>      PR_ExitMonitor(mon2);
>      printf("%30s","TCP_Socket_Client_Server_Test:");
> -    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
>@@ -1665,166 +2209,231 @@
> +    printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":",
>          num_tcp_mesgs_per_connection, tcp_mesg_size);
>  
>---- ../pr/tests/threads.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/threads.c	Mon Jul 25 22:43:10 2005
>-@@ -66,5 +66,5 @@
>- DumbThread(void *arg)
>- {
>--    PRInt32 tmp = (PRInt32)arg;
>-+    PRInt32 tmp = (PRInt32)(intptr_t)arg;
>-     PRThreadScope scope = (PRThreadScope)tmp;
>-     PRThread *thr;
>-@@ -214,8 +214,8 @@
>-     if (debug_mode)
>-     {
>--    printf("\
>--** Tests lots of thread creations.  \n\
>--** Create %ld native threads %ld times. \n\
>--** Create %ld user threads %ld times \n", iterations,count,iterations,count);
>-+    printf("** Tests lots of thread creations.\n"
>-+	"** Create %d native threads %d times.\n"
>-+	"** Create %d user threads %d times.\n", iterations, count,
>-+	iterations, count);
>+     PR_DELETE(cparamp);
>+--- ../pr/tests/thrpool_server.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/thrpool_server.c	2015-11-04 02:02:20.458033000 +0000
>+@@ -329,7 +329,7 @@ TCP_Server(void *arg)
>+     }
>+ 
>+     DPRINTF((
>+-	"TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
>++	"TCP_Server: PR_BIND netaddr.inet.ip = 0x%x, netaddr.inet.port = %d\n",
>+         netaddr.inet.ip, netaddr.inet.port));
>+ 
>+ 	sp = PR_NEW(Server_Param);
>+@@ -341,7 +341,7 @@ TCP_Server(void *arg)
>+ 	sp->iod.socket = sockfd;
>+ 	sp->iod.timeout = PR_SecondsToInterval(60);
>+ 	sp->datalen = tcp_mesg_size;
>+-	sp->exit_mon = sc_mon;
>++	sp->exit_mon = NULL;
>+ 	sp->job_counterp = &job_counter;
>+ 	sp->conn_counter = 0;
>+ 	sp->tp = tp;
>+@@ -464,7 +464,7 @@ TCP_Server_Accept(void *arg)
>+ 						PR_FALSE);
>+ 
>+ 	PR_ASSERT(NULL != jobp);
>+-	DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", jobp));
>++	DPRINTF(("TCP_Server: Created Serve_Client = %p\n", jobp));
>+ 
>+ 	/*
>+ 	 * single-threaded update; no lock needed
>+@@ -481,7 +481,7 @@ TCP_Server_Accept(void *arg)
>+ 						print_stats, sp, PR_FALSE);
>+ 
>+ 	PR_ASSERT(NULL != jobp);
>+-	DPRINTF(("TCP_Server: Created print_stats timer job = 0x%lx\n", jobp));
>++	DPRINTF(("TCP_Server: Created print_stats timer job = %p\n", jobp));
>+ 
>+ exit:
>+ 	PR_EnterMonitor(sp->exit_mon);
>+@@ -498,9 +498,9 @@ exit:
>      }
>+ 	PR_DestroyMonitor(sp->exit_mon);
>+     printf("%30s","TCP_Socket_Client_Server_Test:");
>+-    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
>++    printf(" 1 Server %2d Clients %2d connections_per_client\n",
>+         num_tcp_clients, num_tcp_connections_per_client);
>+-    printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":",
>++    printf("%30s %2d messages_per_connection %4d bytes_per_message\n",":",
>+         num_tcp_mesgs_per_connection, tcp_mesg_size);
>  
>---- ../pr/tests/thruput.c.orig	2009-02-23 00:00:45.000000000 -0500
>-+++ ../pr/tests/thruput.c	2009-11-04 16:56:33.000000000 -0500
>-@@ -99,5 +99,5 @@
>+ 	DPRINTF(("%s: calling PR_ShutdownThreadPool\n", program_name));
>+--- ../pr/tests/thruput.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/thruput.c	2015-11-04 02:02:20.459783000 +0000
>+@@ -66,7 +66,7 @@ static void PR_CALLBACK Clientel(void *a
>+ {
>      PRStatus rv;
>      PRFileDesc *xport;
> -    PRInt32 bytes, sampled;
> +    PRInt32 bytes, sampled = -1;
>      PRIntervalTime now, interval;
>      PRBool do_display = PR_FALSE;
>-@@ -208,5 +208,5 @@
>+     Shared *shared = (Shared*)arg;
>+@@ -175,7 +175,7 @@ static void Client(const char *server_na
>+ 
>  static void PR_CALLBACK Servette(void *arg)
>  {
> -    PRInt32 bytes, sampled;
> +    PRInt32 bytes, sampled = -1;
>      PRIntervalTime now, interval;
>      PRBool do_display = PR_FALSE;
>-@@ -405,4 +405,5 @@
>+     PRFileDesc *client = (PRFileDesc*)arg;
>+@@ -373,6 +373,7 @@ int main(int argc, char **argv)
>      else Client(server_name);
>  
>+     return 0;
> +    return 0;
>  }  /* main */
>  
>---- ../pr/tests/timemac.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/timemac.c	Mon Jul 25 22:45:33 2005
>-@@ -63,5 +63,5 @@
>+ /* thruput.c */
>+--- ../pr/tests/timemac.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/timemac.c	2015-11-04 02:02:20.460286000 +0000
>+@@ -24,7 +24,7 @@ static void printExplodedTime(const PREx
>+     const char *sign;
>  
>      /* Print day of the week, month, day, hour, minute, and second */
> -    printf( "%s %s %ld %02ld:%02ld:%02ld ",
> +    printf( "%s %s %d %02d:%02d:%02d ",
>  	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
>  	    et->tm_hour, et->tm_min, et->tm_sec);
>-@@ -79,5 +79,5 @@
>+ 
>+@@ -40,7 +40,7 @@ static void printExplodedTime(const PREx
>+         }
>          hourOffset = totalOffset / 3600;
>          minOffset = (totalOffset % 3600) / 60;
> -        printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
> +        printf("%s%02d%02d ", sign, hourOffset, minOffset);
>      }
>  
>-@@ -140,5 +140,5 @@
>+     /* Print year */
>+@@ -97,7 +97,7 @@ int main(int argc, char** argv)
>+         printf("Current local time is ");
>  	printExplodedTime(&et);
>  	printf("\n");
> -	printf("GMT offset is %ld, DST offset is %ld\n",
> +	printf("GMT offset is %d, DST offset is %d\n",
>  		et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset);
>          t2 = PR_ImplodeTime(&et);
>---- ../pr/tests/timetest.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/timetest.c	Mon Jul 25 22:48:03 2005
>-@@ -75,5 +75,5 @@
>+         if (LL_NE(t1, t2)) {
>+--- ../pr/tests/timetest.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/timetest.c	2015-11-04 02:02:20.460982000 +0000
>+@@ -36,7 +36,7 @@ static void PrintExplodedTime(const PREx
>+     const char *sign;
>  
>      /* Print day of the week, month, day, hour, minute, and second */
> -    if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ",
> +    if (debug_mode) printf("%s %s %d %02d:%02d:%02d ",
>  	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
>  	    et->tm_hour, et->tm_min, et->tm_sec);
>-@@ -92,5 +92,5 @@
>+ 
>+@@ -53,7 +53,7 @@ static void PrintExplodedTime(const PREx
>+         hourOffset = totalOffset / 3600;
>          minOffset = (totalOffset % 3600) / 60;
>          if (debug_mode) 
> -            printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
> +            printf("%s%02d%02d ", sign, hourOffset, minOffset);
>      }
>  
>-@@ -276,5 +276,5 @@
>+     /* Print year */
>+@@ -232,7 +232,7 @@ int main(int argc, char** argv)
>+         if (debug_mode) printf("Current local time is ");
>  	PrintExplodedTime(&et);
>  	if (debug_mode) printf("\n");
> -	if (debug_mode) printf("GMT offset is %ld, DST offset is %ld\n",
> +	if (debug_mode) printf("GMT offset is %d, DST offset is %d\n",
>  		et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset);
>          t2 = PR_ImplodeTime(&et);
>---- ../pr/tests/y2k.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/y2k.c	Mon Jul 25 22:49:18 2005
>-@@ -82,5 +82,5 @@
>+         if (LL_NE(t1, t2)) {
>+--- ../pr/tests/y2k.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/y2k.c	2015-11-04 02:02:20.461806000 +0000
>+@@ -43,7 +43,7 @@ static void PrintExplodedTime(const PREx
>+     const char *sign;
>  
>      /* Print day of the week, month, day, hour, minute, and second */
> -    printf("%s %s %2ld %02ld:%02ld:%02ld ",
> +    printf("%s %s %2d %02d:%02d:%02d ",
>  	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
>  	    et->tm_hour, et->tm_min, et->tm_sec);
>-@@ -101,5 +101,5 @@
>+ 
>+@@ -62,7 +62,7 @@ static void PrintExplodedTime(const PREx
>+         }
>          hourOffset = totalOffset / 3600;
>          minOffset = (totalOffset % 3600) / 60;
> -        printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
> +        printf("%s%02d%02d ", sign, hourOffset, minOffset);
>      }
>  #ifdef PRINT_DETAILS
>---- ../pr/tests/y2ktmo.c	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/y2ktmo.c	Mon Jul 25 22:58:00 2005
>-@@ -95,5 +95,5 @@
>+ 	printf("{%d, %d, %d, %d, %d, %d, %d, %d, %d, { %d, %d}}\n",et->tm_usec,
>+--- ../pr/tests/y2ktmo.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/y2ktmo.c	2015-11-04 02:02:20.462515000 +0000
>+@@ -70,7 +70,7 @@ static struct _timeb start_time_tb;
>+ 
>  static void SleepThread(void *arg)
>  {
> -    PRIntervalTime timeout = (PRIntervalTime) arg;
> +    PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg;
>      PRIntervalTime elapsed;
>  #if defined(XP_UNIX) || defined(WIN32)
>-@@ -142,5 +142,5 @@
>+     PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
>+@@ -121,7 +121,7 @@ static void SleepThread(void *arg)
>+ 
>  static void AcceptThread(void *arg)
>  {
> -    PRIntervalTime timeout = (PRIntervalTime) arg;
> +    PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg;
>      PRIntervalTime elapsed;
>  #if defined(XP_UNIX) || defined(WIN32)
>-@@ -214,5 +214,5 @@
>+     PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
>+@@ -197,7 +197,7 @@ static void AcceptThread(void *arg)
>+ 
>  static void PollThread(void *arg)
>  {
> -    PRIntervalTime timeout = (PRIntervalTime) arg;
> +    PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg;
>      PRIntervalTime elapsed;
>  #if defined(XP_UNIX) || defined(WIN32)
>-@@ -289,5 +289,5 @@
>+     PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
>+@@ -276,7 +276,7 @@ static void PollThread(void *arg)
>+ 
>  static void WaitCondVarThread(void *arg)
>  {
> -    PRIntervalTime timeout = (PRIntervalTime) arg;
> +    PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg;
>      PRIntervalTime elapsed;
>  #if defined(XP_UNIX) || defined(WIN32)
>-@@ -349,5 +349,5 @@
>+     PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
>+@@ -340,7 +340,7 @@ static void WaitCondVarThread(void *arg)
>+ 
>  static void WaitMonitorThread(void *arg)
>  {
> -    PRIntervalTime timeout = (PRIntervalTime) arg;
> +    PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg;
>      PRIntervalTime elapsed;
>  #if defined(XP_UNIX) || defined(WIN32)
>-@@ -402,5 +402,5 @@
>+     PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
>+@@ -397,7 +397,7 @@ static void WaitMonitorThread(void *arg)
>+ 
>  static void WaitCMonitorThread(void *arg)
>  {
> -    PRIntervalTime timeout = (PRIntervalTime) arg;
> +    PRIntervalTime timeout = (PRIntervalTime)(intptr_t)arg;
>      PRIntervalTime elapsed;
>  #if defined(XP_UNIX) || defined(WIN32)
>-@@ -525,5 +525,5 @@
>+     PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
>+@@ -528,7 +528,7 @@ int main(int argc, char **argv)
>+     for (i = 0; i < num_thread_scopes; i++) { 
>          for (j = 0; j < num_thread_funcs; j++) {
>              threads[idx] = PR_CreateThread(PR_USER_THREAD, threadFuncs[j],
> -                (void*)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL,
> +                (void*)(intptr_t)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL,
>                  threadScopes[i], PR_JOINABLE_THREAD, 0);
>              if (threads[idx] == NULL) {
>---- ../pr/tests/zerolen.c.orig	2012-03-06 14:14:33.000000000 +0100
>-+++ ../pr/tests/zerolen.c	2012-06-04 13:39:40.000000000 +0200
>-@@ -45,7 +45,7 @@
>+                 fprintf(stderr, "PR_CreateThread failed\n");
>+--- ../pr/tests/zerolen.c.orig	2015-10-16 13:22:19.000000000 +0000
>++++ ../pr/tests/zerolen.c	2015-11-04 02:02:20.463071000 +0000
>+@@ -45,7 +45,7 @@ static void ClientThread(void *arg)
>  {
>      PRFileDesc *sock;
>      PRNetAddr addr;
>@@ -1833,7 +2442,7 @@
>      char buf[1024];
>      PRInt32 nbytes;
>  
>-@@ -127,7 +127,7 @@
>+@@ -127,7 +127,7 @@ int main()
>       * First test PR_Writev.
>       */
>      clientThread = PR_CreateThread(PR_USER_THREAD,
>@@ -1842,7 +2451,7 @@
>              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
>      if (NULL == clientThread) {
>          fprintf(stderr, "PR_CreateThread failed\n");
>-@@ -171,7 +171,7 @@
>+@@ -171,7 +171,7 @@ int main()
>       * Then test PR_Write.
>       */
>      clientThread = PR_CreateThread(PR_USER_THREAD,
>@@ -1851,7 +2460,7 @@
>              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
>      if (NULL == clientThread) {
>          fprintf(stderr, "PR_CreateThread failed\n");
>-@@ -216,7 +216,7 @@
>+@@ -216,7 +216,7 @@ int main()
>       * Finally test PR_Send.
>       */
>      clientThread = PR_CreateThread(PR_USER_THREAD,
>@@ -1860,188 +2469,3 @@
>              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
>      if (NULL == clientThread) {
>          fprintf(stderr, "PR_CreateThread failed\n");
>---- ../pr/tests/runtests.sh	Sun Apr 25 11:01:02 2004
>-+++ ../pr/tests/runtests.sh	Tue Jul 26 00:01:35 2005
>-@@ -85,7 +85,4 @@
>- #
>- 
>--#forktest (failed on IRIX)
>--#nbconn - fails on some platforms 
>--#poll_er - fails on some platforms? limited use?
>- #prpoll -  the bad-FD test needs to be moved to a different test
>- #sleep	-  specific to OS/2
>-@@ -119,4 +116,5 @@
>- fileio
>- foreign
>-+forktest
>- formattm
>- fsync
>-@@ -126,5 +124,4 @@
>- initclk
>- inrval
>--instrumt
>- intrio
>- intrupt
>-@@ -146,4 +143,5 @@
>- multiwait
>- nameshm1
>-+nbconn
>- nblayer
>- nonblock
>-@@ -161,4 +159,5 @@
>- pipeping2
>- pipeself
>-+poll_er
>- poll_nm
>- poll_to
>-@@ -230,5 +229,5 @@
>- printf "BEGIN\t\t\t`date`\n"
>- printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n"
>--printf "Test\t\t\tResult\n\n"
>-+printf "            Test\t\t\tResult\n\n"
>- if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
>- 	for prog in $TESTS
>-@@ -248,8 +247,6 @@
>- 	for prog in $TESTS
>- 	do
>--		printf "$prog"
>--		printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>--		export test_rval
>--		./$prog >> ${LOGFILE} 2>&1 &
>-+		printf %16s $prog
>-+		./$prog >> $prog.output 2>&1 &
>- 		test_pid=$!
>- 		sleep_pid=0
>-@@ -266,7 +263,7 @@
>- 		else
>- 			printf "\t\t\tFAILED\n";
>-+			sed "s,^,	$prog:	," < $prog.output
>- 			rval=1
>- 		fi;
>--		printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>- 	done
>- fi;
>-@@ -274,19 +271,2 @@
>- printf "END\t\t\t`date`\n"
>- exit $rval
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>--
>---- ../pr/tests/server_test.c.orig	2009-03-18 10:49:45.000000000 +0100
>-+++ ../pr/tests/server_test.c	2009-06-17 09:30:18.000000000 +0200
>-@@ -92,7 +92,7 @@
>- #ifdef DEBUGPRINTS
>- #define DPRINTF printf
>- #else
>--#define DPRINTF
>-+#define DPRINTF(...)
>- #endif
>- 
>- 
>-@@ -534,6 +534,7 @@
>-     do_work();
>- }
>- 
>-+#if 0
>- static void do_workUK(void)
>- {
>-     ServerScope = PR_LOCAL_THREAD;
>-@@ -554,6 +555,7 @@
>-     ClientScope = PR_GLOBAL_THREAD;
>-     do_work();
>- }
>-+#endif
>- 
>- 
>- static void Measure(void (*func)(void), const char *msg)
>---- ../pr/tests/servr_ku.c.orig	2009-03-18 10:49:46.000000000 +0100
>-+++ ../pr/tests/servr_ku.c	2009-06-17 09:51:45.000000000 +0200
>-@@ -89,7 +89,7 @@
>- #ifdef DEBUGPRINTS
>- #define DPRINTF printf
>- #else
>--#define DPRINTF
>-+#define DPRINTF(...)
>- #endif
>- 
>- PRIntn failed_already=0;
>---- ../pr/tests/servr_uk.c.orig	2009-03-18 10:49:46.000000000 +0100
>-+++ ../pr/tests/servr_uk.c	2009-06-17 09:53:37.000000000 +0200
>-@@ -89,7 +89,7 @@
>- #ifdef DEBUGPRINTS
>- #define DPRINTF printf
>- #else
>--#define DPRINTF
>-+#define DPRINTF(...)
>- #endif
>- 
>- PRIntn failed_already=0;
>---- ../pr/tests/servr_uu.c.orig	2009-03-18 10:49:46.000000000 +0100
>-+++ ../pr/tests/servr_uu.c	2009-06-17 09:55:30.000000000 +0200
>-@@ -89,7 +89,7 @@
>- #ifdef DEBUGPRINTS
>- #define DPRINTF printf
>- #else
>--#define DPRINTF
>-+#define DPRINTF(...)
>- #endif
>- 
>- PRIntn failed_already=0;
>---- ../pr/tests/cltsrv.c	2009-05-06 01:40:38.000000000 -0400
>-+++ ../pr/tests/cltsrv.c	2009-11-04 15:34:25.000000000 -0500
>-@@ -920,5 +920,5 @@
>-     PRUintn index;
>-     PRBool boolean;
>--    CSClient_t *client;
>-+    CSClient_t *client = NULL;
>-     PRStatus rv, joinStatus;
>-     CSServer_t *server = NULL;
>---- ../pr/tests/parsetm.c	2009-05-11 18:23:19.000000000 -0400
>-+++ ../pr/tests/parsetm.c	2009-11-04 16:27:29.000000000 -0500
>-@@ -64,6 +64,6 @@
>-     /* Print day of the week, month, day, hour, minute, and second */
>-     if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ",
>--	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
>--	    et->tm_hour, et->tm_min, et->tm_sec);
>-+	    dayOfWeek[et->tm_wday], month[et->tm_month], (long)et->tm_mday,
>-+	    (long)et->tm_hour, (long)et->tm_min, (long)et->tm_sec);
>- 
>-     /* Print time zone */
>-@@ -80,4 +80,4 @@
>-         minOffset = (totalOffset % 3600) / 60;
>-         if (debug_mode) 
>--            printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
>-+            printf("%s%02ld%02ld ", sign, (long)hourOffset, (long)minOffset);
>-     }
>---- ../pr/tests/provider.c	2009-05-06 01:40:39.000000000 -0400
>-+++ ../pr/tests/provider.c	2009-11-04 16:29:30.000000000 -0500
>-@@ -1082,5 +1082,5 @@
>-     PRUintn index;
>-     PRBool boolean;
>--    CSClient_t *client;
>-+    CSClient_t *client = NULL;
>-     PRStatus rv, joinStatus;
>-     CSServer_t *server = NULL;
>---- ../pr/tests/switch.c	2009-05-06 01:40:39.000000000 -0400
>-+++ ../pr/tests/switch.c	2009-11-04 16:48:07.000000000 -0500
>-@@ -113,5 +113,5 @@
>-     PRBool help = PR_FALSE;
>-     PRUintn concurrency = 1;
>--    Shared *shared, *link;
>-+    Shared *shared = NULL, *link;
>-     PRIntervalTime timein, timeout;
>-     PRThreadScope thread_scope = PR_LOCAL_THREAD;
>diff -Nru www/firefox/Makefile www/firefox/Makefile
>--- www/firefox/Makefile	2015-11-14 20:59:26.995003938 +0100
>+++ www/firefox/Makefile	2015-11-14 22:02:17.500828190 +0100
>@@ -2,9 +2,8 @@
> # $FreeBSD: head/www/firefox/Makefile 401587 2015-11-14 19:34:12Z jbeich $
> 
> PORTNAME=	firefox
>-DISTVERSION=	41.0.2
>+DISTVERSION=	42.0
> DISTVERSIONSUFFIX=.source
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
>@@ -13,7 +12,7 @@
> MAINTAINER=	gecko@FreeBSD.org
> COMMENT=	Web browser based on the browser portion of Mozilla
> 
>-BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr \
>+BUILD_DEPENDS=	nspr>=4.10.10:${PORTSDIR}/devel/nspr \
> 		nss>=3.19.2:${PORTSDIR}/security/nss \
> 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
> 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
>@@ -26,8 +25,8 @@
> 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
> 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
> 		zip:${PORTSDIR}/archivers/zip \
>-		unzip:${PORTSDIR}/archivers/unzip
>-#		opus>=1.1:${PORTSDIR}/audio/opus \
>+		unzip:${PORTSDIR}/archivers/unzip \
>+		yasm:${PORTSDIR}/devel/yasm
> 
> LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
> 
>@@ -58,7 +57,7 @@
> .include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
> 
>-WRKSRC:=	${WRKDIR}/mozilla-release
>+WRKSRC:=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> .if ${PORT_OPTIONS:MALSA}
> RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
>diff -Nru www/firefox/distinfo www/firefox/distinfo
>--- www/firefox/distinfo	2015-10-24 15:34:18.023778872 +0200
>+++ www/firefox/distinfo	2015-11-14 22:02:55.728458522 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (firefox-41.0.2.source.tar.xz) = ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e
>-SIZE (firefox-41.0.2.source.tar.xz) = 159761468
>+SHA256 (firefox-42.0.source.tar.xz) = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
>+SIZE (firefox-42.0.source.tar.xz) = 165766832
>diff -Nru www/firefox/files/patch-browser-app-nsBrowserApp.cpp www/firefox/files/patch-browser-app-nsBrowserApp.cpp
>--- www/firefox/files/patch-browser-app-nsBrowserApp.cpp	2015-08-11 19:58:46.280312015 +0200
>+++ www/firefox/files/patch-browser-app-nsBrowserApp.cpp	2015-11-13 23:07:53.000000000 +0100
>@@ -1,6 +1,6 @@
> --- browser/app/nsBrowserApp.cpp~
> +++ browser/app/nsBrowserApp.cpp
>-@@ -417,6 +417,8 @@ int main(int argc, char* argv[])
>+@@ -338,6 +338,8 @@ int main(int argc, char* argv[])
>    TriggerQuirks();
>  #endif
>  
>diff -Nru www/firefox/files/patch-bug1181382 www/firefox/files/patch-bug1181382
>--- www/firefox/files/patch-bug1181382	2015-10-10 14:27:32.840050622 +0200
>+++ www/firefox/files/patch-bug1181382	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- dom/mobilemessage/MobileMessageManager.h.orig	2015-09-17 22:13:25 UTC
>-+++ dom/mobilemessage/MobileMessageManager.h
>-@@ -14,11 +14,11 @@
>- class nsISmsService;
>- class nsIDOMMozSmsMessage;
>- class nsIDOMMozMmsMessage;
>--class Promise;
>- 
>- namespace mozilla {
>- namespace dom {
>- 
>-+class Promise;
>- class DOMRequest;
>- class DOMCursor;
>- struct MmsParameters;
>diff -Nru www/firefox/files/patch-bug779713 www/firefox/files/patch-bug779713
>--- www/firefox/files/patch-bug779713	2015-07-18 22:09:28.856473744 +0200
>+++ www/firefox/files/patch-bug779713	2015-11-13 23:07:53.000000000 +0100
>@@ -1,37 +1,6 @@
>-diff --git mfbt/Alignment.h mfbt/Alignment.h
>-index e0843ca..353ec36 100644
>---- mfbt/Alignment.h
>-+++ mfbt/Alignment.h
>-@@ -9,11 +9,20 @@
>- #ifndef mozilla_Alignment_h
>- #define mozilla_Alignment_h
>- 
>-+#include "mozilla/Attributes.h"
>-+
>- #include <stddef.h>
>- #include <stdint.h>
>- 
>- namespace mozilla {
>- 
>-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
>-+#define MOZ_ALIGNOF(T) alignof(T)
>-+#elif defined(__GNUC__)
>-+#define MOZ_ALIGNOF(T) __alignof__(T)
>-+#elif defined(_MSC_VER)
>-+#define MOZ_ALIGNOF(T) __alignof(T)
>-+#else
>- /*
>-  * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
>-  * bytes of alignment a given type needs.
>-@@ -32,6 +41,7 @@ public:
>- };
>- 
>- #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
>-+#endif
>- 
>- /*
>-  * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
>-@@ -43,7 +53,10 @@ public:
>+--- mfbt/Alignment.h.orig	2015-10-29 22:17:54.000000000 +0000
>++++ mfbt/Alignment.h	2015-11-03 21:24:20.123910000 +0000
>+@@ -44,7 +45,10 @@
>   * will declare a two-character array |arr| aligned to 8 bytes.
>   */
>  
>@@ -43,33 +12,3 @@
>  #  define MOZ_ALIGNED_DECL(_type, _align) \
>       _type __attribute__((aligned(_align)))
>  #elif defined(_MSC_VER)
>-diff --git mfbt/Attributes.h mfbt/Attributes.h
>-index d317766..ddb13da 100644
>---- mfbt/Attributes.h
>-+++ mfbt/Attributes.h
>-@@ -50,6 +50,7 @@
>-  * don't indicate support for them here, due to
>-  * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
>-  */
>-+#  define MOZ_HAVE_CXX11_ALIGNAS
>- #  define MOZ_HAVE_NEVER_INLINE          __declspec(noinline)
>- #  define MOZ_HAVE_NORETURN              __declspec(noreturn)
>- #  ifdef __clang__
>-@@ -70,6 +71,9 @@
>- #  ifndef __has_extension
>- #    define __has_extension __has_feature /* compatibility, for older versions of clang */
>- #  endif
>-+#  if __has_extension(cxx_alignas)
>-+#    define MOZ_HAVE_CXX11_ALIGNAS
>-+#  endif
>- #  if __has_extension(cxx_constexpr)
>- #    define MOZ_HAVE_CXX11_CONSTEXPR
>- #  endif
>-@@ -86,6 +90,7 @@
>- #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
>- #    define MOZ_HAVE_CXX11_CONSTEXPR
>- #    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
>-+#      define MOZ_HAVE_CXX11_ALIGNAS
>- #      define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
>- #    endif
>- #    define MOZ_HAVE_EXPLICIT_CONVERSION
>diff -Nru www/firefox/files/patch-bug847568 www/firefox/files/patch-bug847568
>--- www/firefox/files/patch-bug847568	2015-10-10 14:27:33.290050596 +0200
>+++ www/firefox/files/patch-bug847568	2015-11-13 23:07:53.000000000 +0100
>@@ -174,7 +174,7 @@
> index 1d0c2f9..adb8941 100644
> --- gfx/skia/moz.build
> +++ gfx/skia/moz.build
>-@@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']:
>+@@ -675,6 +675,9 @@ if CONFIG['GNU_CXX']:
>      if CONFIG['CPU_ARCH'] == 'arm':
>          SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
>  
>diff -Nru www/firefox/files/patch-bug981348 www/firefox/files/patch-bug981348
>--- www/firefox/files/patch-bug981348	2015-07-18 22:09:28.211473622 +0200
>+++ www/firefox/files/patch-bug981348	2015-11-13 23:07:53.000000000 +0100
>@@ -1,14 +1,12 @@
>-diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
>-index 4b21361..cb3be32 100644
> --- dom/system/OSFileConstants.cpp
> +++ dom/system/OSFileConstants.cpp
>-@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
>+@@ -662,7 +662,7 @@
>  
>-   { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
>+   { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
>  
>--  { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
>-+  { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
>-   { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
>+-  { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
>++  { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
>+   { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
>  
>  #endif // defined(XP_UNIX)
> diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
>diff -Nru www/firefox/files/patch-memory-jemalloc-Makefile.in www/firefox/files/patch-memory-jemalloc-Makefile.in
>--- www/firefox/files/patch-memory-jemalloc-Makefile.in	2015-10-10 14:27:33.290050596 +0200
>+++ www/firefox/files/patch-memory-jemalloc-Makefile.in	2015-11-13 23:07:53.000000000 +0100
>@@ -1,10 +1,11 @@
>---- memory/jemalloc/Makefile.in~
>-+++ memory/jemalloc/Makefile.in
>-@@ -7,3 +7,7 @@ include $(topsrcdir)/config/rules.mk
>- ifdef GNU_CC
>- CFLAGS += -std=gnu99
>+--- memory/mozjemalloc/Makefile.in.orig	2015-11-03 22:02:29.393485000 +0000
>++++ memory/mozjemalloc/Makefile.in	2015-11-03 22:02:40.241624000 +0000
>+@@ -17,3 +17,8 @@ endif
>  endif
>-+
>+ endif
>+
>++include $(topsrcdir)/config/config.mk
>++ 
> +# XXX startup crash workaround for gcc47 on amd64
> +jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
> +jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
>diff -Nru www/firefox/files/patch-nslib www/firefox/files/patch-nslib
>--- www/firefox/files/patch-nslib	1970-01-01 01:00:00.000000000 +0100
>+++ www/firefox/files/patch-nslib	2015-11-13 23:07:53.000000000 +0100
>@@ -0,0 +1,10 @@
>+--- toolkit/system/unixproxy/nsLibProxySettings.cpp.orig	2015-11-04 09:28:20.503528000 +0100
>++++ toolkit/system/unixproxy/nsLibProxySettings.cpp	2015-11-04 09:28:48.544958000 +0100
>+@@ -9,6 +9,7 @@
>+ #include "nsIURI.h"
>+ #include "nsString.h"
>+ #include "nsCOMPtr.h"
>++#include "nsNetCID.h"
>+ #include "nspr.h"
>+ 
>+ extern "C" {
>diff -Nru www/firefox/files/patch-soundtouch-revert www/firefox/files/patch-soundtouch-revert
>--- www/firefox/files/patch-soundtouch-revert	1970-01-01 01:00:00.000000000 +0100
>+++ www/firefox/files/patch-soundtouch-revert	2015-11-13 23:07:53.000000000 +0100
>@@ -0,0 +1,136 @@
>+--- ./dom/media/AudioStream.cpp.orig	2015-10-29 22:17:56.000000000 +0000
>++++ ./dom/media/AudioStream.cpp	2015-11-04 04:07:11.782776000 +0000
>+@@ -129,7 +129,6 @@ AudioStream::AudioStream()
>+   , mOutChannels(0)
>+   , mWritten(0)
>+   , mAudioClock(this)
>+-  , mTimeStretcher(nullptr)
>+   , mLatencyRequest(HighLatency)
>+   , mReadPoint(0)
>+   , mDumpFile(nullptr)
>+@@ -152,9 +151,6 @@ AudioStream::~AudioStream()
>+   if (mDumpFile) {
>+     fclose(mDumpFile);
>+   }
>+-  if (mTimeStretcher) {
>+-    soundtouch::destroySoundTouchObj(mTimeStretcher);
>+-  }
>+ }
>+ 
>+ size_t
>+@@ -177,7 +173,7 @@ nsresult AudioStream::EnsureTimeStretche
>+ {
>+   mMonitor.AssertCurrentThreadOwns();
>+   if (!mTimeStretcher) {
>+-    mTimeStretcher = soundtouch::createSoundTouchObj();
>++    mTimeStretcher = new soundtouch::SoundTouch();
>+     mTimeStretcher->setSampleRate(mInRate);
>+     mTimeStretcher->setChannels(mOutChannels);
>+     mTimeStretcher->setPitch(1.0);
>+--- ./dom/media/AudioStream.h.orig	2015-10-29 22:17:56.000000000 +0000
>++++ ./dom/media/AudioStream.h	2015-11-04 04:07:11.783405000 +0000
>+@@ -15,7 +15,7 @@
>+ #include "mozilla/RefPtr.h"
>+ #include "mozilla/UniquePtr.h"
>+ #include "CubebUtils.h"
>+-#include "soundtouch/SoundTouchFactory.h"
>++#include "soundtouch/SoundTouch.h"
>+ 
>+ namespace mozilla {
>+ 
>+@@ -329,7 +329,7 @@ private:
>+   // Number of frames written to the buffers.
>+   int64_t mWritten;
>+   AudioClock mAudioClock;
>+-  soundtouch::SoundTouch* mTimeStretcher;
>++  nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
>+   nsRefPtr<AsyncLatencyLogger> mLatencyLog;
>+ 
>+   // copy of Latency logger's starting time for offset calculations
>+--- ./media/libsoundtouch/src/SoundTouchFactory.cpp.orig	2015-10-29 22:17:50.000000000 +0000
>++++ ./media/libsoundtouch/src/SoundTouchFactory.cpp	2015-11-04 04:07:11.783823000 +0000
>+@@ -1,31 +0,0 @@
>+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
>+-/* vim:set ts=2 sw=2 sts=2 et cindent: */
>+-/* 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/. */
>+-
>+-#include <soundtouch/SoundTouch.h>
>+-
>+-namespace soundtouch
>+-{
>+-
>+-EXPORT
>+-soundtouch::SoundTouch*
>+-createSoundTouchObj()
>+-{
>+-  return new soundtouch::SoundTouch();
>+-}
>+-
>+-EXPORT
>+-void
>+-destroySoundTouchObj(soundtouch::SoundTouch* aObj)
>+-{
>+-  // SoundTouch runs deletes in its destructor, meaning they need to be run in
>+-  // the DLL context. Gecko should send its SoundTouch obj pointers here to be
>+-  // cleaned up.
>+-  if (aObj) {
>+-    delete aObj;
>+-  }
>+-}
>+-
>+-}
>+--- ./media/libsoundtouch/src/SoundTouchFactory.h.orig	2015-10-29 22:17:50.000000000 +0000
>++++ ./media/libsoundtouch/src/SoundTouchFactory.h	2015-11-04 04:07:11.784212000 +0000
>+@@ -1,22 +0,0 @@
>+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
>+-/* vim:set ts=2 sw=2 sts=2 et cindent: */
>+-/* 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/. */
>+-
>+-// Code for dealing with creating/deleting SoundTouch objects across DLL
>+-// boundaries.
>+-
>+-#include <soundtouch/STTypes.h>
>+-#include <soundtouch/SoundTouch.h>
>+-
>+-namespace soundtouch
>+-{
>+-EXPORT
>+-soundtouch::SoundTouch*
>+-createSoundTouchObj();
>+-
>+-EXPORT
>+-void
>+-destroySoundTouchObj(soundtouch::SoundTouch* aObj);
>+-}
>+--- ./media/libsoundtouch/src/moz.build.orig	2015-10-29 22:17:50.000000000 +0000
>++++ ./media/libsoundtouch/src/moz.build	2015-11-04 04:07:11.784640000 +0000
>+@@ -8,7 +8,6 @@ EXPORTS.soundtouch += [
>+     'FIFOSamplePipe.h',
>+     'SoundTouch.h',
>+     'soundtouch_config.h',
>+-    'SoundTouchFactory.h',
>+     'STTypes.h',
>+ ]
>+ 
>+@@ -22,7 +21,6 @@ UNIFIED_SOURCES += [
>+     'InterpolateShannon.cpp',
>+     'RateTransposer.cpp',
>+     'SoundTouch.cpp',
>+-    'SoundTouchFactory.cpp',
>+     'TDStretch.cpp',
>+ ]
>+ 
>+--- ./media/libsoundtouch/src/soundtouch_perms.h.orig	2015-10-29 22:17:50.000000000 +0000
>++++ ./media/libsoundtouch/src/soundtouch_perms.h	2015-11-04 04:07:11.785026000 +0000
>+@@ -12,7 +12,6 @@
>+ 
>+ #pragma GCC visibility push(default)
>+ #include "SoundTouch.h"
>+-#include "SoundTouchFactory.h"
>+ #pragma GCC visibility pop
>+ 
>+ #endif // MOZILLA_SOUNDTOUCH_PERMS_H
>diff -Nru www/firefox/files/patch-z-bug517422 www/firefox/files/patch-z-bug517422
>--- www/firefox/files/patch-z-bug517422	2015-08-10 18:08:41.222878877 +0200
>+++ www/firefox/files/patch-z-bug517422	2015-11-13 23:07:53.000000000 +0100
>@@ -67,19 +67,18 @@
>  ]
>  
>  DIRS += ['../../' + i for i in external_dirs]
>-diff --git config/system-headers config/system-headers
>-index bef567c..9807c29 100644
> --- config/system-headers
> +++ config/system-headers
>-@@ -1263,7 +1263,6 @@ X11/Xlocale.h
>+@@ -1257,8 +1257,6 @@ X11/Xlocale.h
>  X11/Xos.h
>  X11/Xutil.h
>  zmouse.h
> -soundtouch/SoundTouch.h
>- #if MOZ_NATIVE_PNG==1
>- png.h
>+-soundtouch/SoundTouchFactory.h
>+ #if MOZ_LIBAV_FFT==1
>+ libavcodec/avfft.h
>  #endif
>-@@ -1325,6 +1324,7 @@ vorbis/codec.h
>+@@ -1323,6 +1321,7 @@ vorbis/codec.h
>  theora/theoradec.h
>  tremor/ivorbiscodec.h
>  speex/speex_resampler.h
>@@ -87,7 +86,7 @@
>  ogg/ogg.h
>  ogg/os_types.h
>  nestegg/nestegg.h
>-@@ -1365,3 +1365,35 @@ graphite2/Segment.h
>+@@ -1364,3 +1363,35 @@ graphite2/Segment.h
>  harfbuzz/hb-ot.h
>  harfbuzz/hb.h
>  #endif
>@@ -285,19 +284,6 @@
>  dnl = Disable VP8 decoder support
>  dnl ========================================================
>  MOZ_ARG_DISABLE_BOOL(webm,
>-diff --git dom/media/AudioStream.h dom/media/AudioStream.h
>-index 085676d..00c54fb 100644
>---- dom/media/AudioStream.h
>-+++ dom/media/AudioStream.h
>-@@ -17,7 +17,7 @@
>- #include "CubebUtils.h"
>- 
>- namespace soundtouch {
>--class SoundTouch;
>-+class MOZ_IMPORT_API SoundTouch;
>- }
>- 
>- namespace mozilla {
> diff --git dom/media/moz.build dom/media/moz.build
> index 7526cff..e0a0ca0 100644
> --- dom/media/moz.build
>diff -Nru www/firefox/files/patch-z-remove-malloc_h www/firefox/files/patch-z-remove-malloc_h
>--- www/firefox/files/patch-z-remove-malloc_h	1970-01-01 01:00:00.000000000 +0100
>+++ www/firefox/files/patch-z-remove-malloc_h	2015-11-13 23:07:53.000000000 +0100
>@@ -0,0 +1,21 @@
>+--- config/system-headers.orig	2015-11-13 22:45:25.585796000 +0100
>++++ config/system-headers	2015-11-13 22:45:41.754800000 +0100
>+@@ -709,7 +709,6 @@
>+ MacTCP.h
>+ MacTypes.h
>+ MacWindows.h
>+-malloc.h
>+ malloc_np.h
>+ map
>+ mapicode.h
>+--- media/libav/config_unix.h.orig	2015-11-13 22:55:57.180327000 +0100
>++++ media/libav/config_unix.h	2015-11-13 22:56:21.581961000 +0100
>+@@ -144,7 +144,7 @@
>+ #define HAVE_MACH_MACH_TIME_H 0
>+ #define HAVE_MACHINE_IOCTL_BT848_H 0
>+ #define HAVE_MACHINE_IOCTL_METEOR_H 0
>+-#define HAVE_MALLOC_H 1
>++#define HAVE_MALLOC_H 0
>+ #define HAVE_POLL_H 1
>+ #define HAVE_SNDIO_H 0
>+ #define HAVE_SOUNDCARD_H 0

Actions: View | Diff

Attachments on bug 204277: 162759 | 162760 | 162761 | 162766 | 162767 | 162768 | 162779 | 162786 | 162789 | 162790 | 163129