Attachment #163394 for bug #204725

Lines 15-20 Link Here

(-)files/patch-bug782109 (+1 lines)
15	#if __FreeBSD_version >= 400008	15	#if __FreeBSD_version >= 400008
16	/*	16	/*
17	* libc_r before this version of FreeBSD doesn't have poll().	17	* libc_r before this version of FreeBSD doesn't have poll().
		18	* libc_r before this version of FreeBSD doesn't have poll().
18	--- pr/src/misc/prnetdb.c.orig 2015-10-16 13:22:19 UTC	19	--- pr/src/misc/prnetdb.c.orig 2015-10-16 13:22:19 UTC
19	+++ pr/src/misc/prnetdb.c	20	+++ pr/src/misc/prnetdb.c
20	@@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL;	21	@@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL;

Lines 16-21 Link Here

(-)files/patch-libtests (+2 lines)
16		16
17		17
18	/*	18	/*
		19	*/
		20	/*
19	--- lib/tests/base64t.c.orig 2015-10-16 13:22:19 UTC	21	--- lib/tests/base64t.c.orig 2015-10-16 13:22:19 UTC
20	+++ lib/tests/base64t.c	22	+++ lib/tests/base64t.c
21	@@ -1987,7 +1987,6 @@ PRBool test_008(void)	23	@@ -1987,7 +1987,6 @@ PRBool test_008(void)




     printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));
     fflush(stdout);
     sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
     sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
--- pr/tests/getai.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/getai.c
@@ -13,8 +13,13 @@ int main(int argc, char **argv)

     PRInt32 size;
     PR_DEFINE_TRACE( th );
     PRThread *t1, *t2;
 #include <prmem.h>
--- pr/tests/io_timeout.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/io_timeout.c
@@ -22,11 +22,13 @@

 							PR_IO_TIMEOUT_ERROR);
 			}
     	} else {
 	printf("thread id %d, scope %s\n", info->id, scope_str);
--- pr/tests/layer.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/layer.c
@@ -45,7 +45,10 @@ static PRUint16 default_port = 12273;

     PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 );
     PRInt64 largeNumSHL5      = LL_INIT( 0x0000001f, 0xffffffe0 );        
     PRInt64 result, result2;
     /*
 /*
--- pr/tests/mbcs.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/mbcs.c
@@ -54,13 +54,12 @@ char *dirName =  NULL;  /* directory nam

             break;
         }
     } while (-1 != rv);
     } while (-1 != rv);
     } while (-1 != rv);
--- pr/tests/nonblock.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/nonblock.c
@@ -39,7 +39,7 @@

 
     printf("PASS\n");
     return 0;
 {
--- pr/tests/parsetm.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/parsetm.c
@@ -31,8 +31,8 @@ static void PrintExplodedTime(const PREx

-
-
-
 gethost
 ntioto
 pollable
--- pr/tests/sel_spd.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/sel_spd.c
@@ -15,6 +15,9 @@

 
 	fprintf(stdout, "Server results:\n\n");
 	for (index=0; index<_threads_max*2; index+=2) {
 #endif
--- pr/tests/selct_nm.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/selct_nm.c
@@ -45,7 +45,7 @@ PRIntn debug_mode;

 
+    return exitcode;
 }
 {
 			printf ("NOSTATUS\n");
 }
--- pr/tests/semaerr.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/semaerr.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv)

 
 
 static void Measure(void (*func)(void), const char *msg)
     ServerScope = PR_LOCAL_THREAD;
 static void Measure(void (*func)(void), const char *msg)
--- pr/tests/servr_kk.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/servr_kk.c
@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;

 
 static void do_workKK(void)
 {
     ServerScope = PR_LOCAL_THREAD;
 {
--- pr/tests/servr_ku.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/servr_ku.c
@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;

 #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 UTC
+++ pr/tests/threads.c
@@ -27,7 +27,7 @@ void

 }  /* main */
 
 /* thruput.c */
 /* thruput.c */
--- pr/tests/timemac.c.orig	2015-10-16 13:22:19 UTC
+++ pr/tests/timemac.c
@@ -24,7 +24,7 @@ static void printExplodedTime(const PREx

Lines 103-108 Link Here

(-)files/patch-warnings (+1 lines)
103	} else {	103	} else {
104	tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout);	104	tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout);
105	tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(	105	tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
		106	tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
106	--- pr/src/pthreads/ptsynch.c.orig 2015-10-16 13:22:19 UTC	107	--- pr/src/pthreads/ptsynch.c.orig 2015-10-16 13:22:19 UTC
107	+++ pr/src/pthreads/ptsynch.c	108	+++ pr/src/pthreads/ptsynch.c
108	@@ -30,7 +30,7 @@ static pthread_t pt_zero_tid; /* a null	109	@@ -30,7 +30,7 @@ static pthread_t pt_zero_tid; /* a null

Return to bug 204725

Lines 320-325 Link Here

(-)files/patch-tests (+21 lines)
320	printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));	320	printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));
321	fflush(stdout);	321	fflush(stdout);
322	sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));	322	sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
		323	sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
323	--- pr/tests/getai.c.orig 2015-10-16 13:22:19 UTC	324	--- pr/tests/getai.c.orig 2015-10-16 13:22:19 UTC
324	+++ pr/tests/getai.c	325	+++ pr/tests/getai.c
325	@@ -13,8 +13,13 @@ int main(int argc, char **argv)	326	@@ -13,8 +13,13 @@ int main(int argc, char **argv)
Lines 421-426 Link Here
421	PRInt32 size;	422	PRInt32 size;
422	PR_DEFINE_TRACE( th );	423	PR_DEFINE_TRACE( th );
423	PRThread t1, t2;	424	PRThread t1, t2;
		425	#include <prmem.h>
424	--- pr/tests/io_timeout.c.orig 2015-10-16 13:22:19 UTC	426	--- pr/tests/io_timeout.c.orig 2015-10-16 13:22:19 UTC
425	+++ pr/tests/io_timeout.c	427	+++ pr/tests/io_timeout.c
426	@@ -22,11 +22,13 @@	428	@@ -22,11 +22,13 @@
Lines 490-495 Link Here
490	PR_IO_TIMEOUT_ERROR);	492	PR_IO_TIMEOUT_ERROR);
491	}	493	}
492	} else {	494	} else {
		495	printf("thread id %d, scope %s\n", info->id, scope_str);
493	--- pr/tests/layer.c.orig 2015-10-16 13:22:19 UTC	496	--- pr/tests/layer.c.orig 2015-10-16 13:22:19 UTC
494	+++ pr/tests/layer.c	497	+++ pr/tests/layer.c
495	@@ -45,7 +45,10 @@ static PRUint16 default_port = 12273;	498	@@ -45,7 +45,10 @@ static PRUint16 default_port = 12273;
Lines 540-545 Link Here
540	PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 );	543	PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 );
541	PRInt64 largeNumSHL5 = LL_INIT( 0x0000001f, 0xffffffe0 );	544	PRInt64 largeNumSHL5 = LL_INIT( 0x0000001f, 0xffffffe0 );
542	PRInt64 result, result2;	545	PRInt64 result, result2;
		546	/*
		547	/*
543	--- pr/tests/mbcs.c.orig 2015-10-16 13:22:19 UTC	548	--- pr/tests/mbcs.c.orig 2015-10-16 13:22:19 UTC
544	+++ pr/tests/mbcs.c	549	+++ pr/tests/mbcs.c
545	@@ -54,13 +54,12 @@ char dirName = NULL; / directory nam	550	@@ -54,13 +54,12 @@ char dirName = NULL; / directory nam
Lines 671-676 Link Here
671	break;	676	break;
672	}	677	}
673	} while (-1 != rv);	678	} while (-1 != rv);
		679	} while (-1 != rv);
		680	} while (-1 != rv);
674	--- pr/tests/nonblock.c.orig 2015-10-16 13:22:19 UTC	681	--- pr/tests/nonblock.c.orig 2015-10-16 13:22:19 UTC
675	+++ pr/tests/nonblock.c	682	+++ pr/tests/nonblock.c
676	@@ -39,7 +39,7 @@	683	@@ -39,7 +39,7 @@
Lines 750-755 Link Here
750		757
751	printf("PASS\n");	758	printf("PASS\n");
752	return 0;	759	return 0;
		760	{
753	--- pr/tests/parsetm.c.orig 2015-10-16 13:22:19 UTC	761	--- pr/tests/parsetm.c.orig 2015-10-16 13:22:19 UTC
754	+++ pr/tests/parsetm.c	762	+++ pr/tests/parsetm.c
755	@@ -31,8 +31,8 @@ static void PrintExplodedTime(const PREx	763	@@ -31,8 +31,8 @@ static void PrintExplodedTime(const PREx
Lines 1132-1137 Link Here
1132	-	1140	-
1133	-	1141	-
1134	-	1142	-
		1143	gethost
		1144	ntioto
		1145	pollable
1135	--- pr/tests/sel_spd.c.orig 2015-10-16 13:22:19 UTC	1146	--- pr/tests/sel_spd.c.orig 2015-10-16 13:22:19 UTC
1136	+++ pr/tests/sel_spd.c	1147	+++ pr/tests/sel_spd.c
1137	@@ -15,6 +15,9 @@	1148	@@ -15,6 +15,9 @@
Lines 1213-1218 Link Here
1213		1224
1214	fprintf(stdout, "Server results:\n\n");	1225	fprintf(stdout, "Server results:\n\n");
1215	for (index=0; index<_threads_max*2; index+=2) {	1226	for (index=0; index<_threads_max*2; index+=2) {
		1227	#endif
1216	--- pr/tests/selct_nm.c.orig 2015-10-16 13:22:19 UTC	1228	--- pr/tests/selct_nm.c.orig 2015-10-16 13:22:19 UTC
1217	+++ pr/tests/selct_nm.c	1229	+++ pr/tests/selct_nm.c
1218	@@ -45,7 +45,7 @@ PRIntn debug_mode;	1230	@@ -45,7 +45,7 @@ PRIntn debug_mode;
Lines 1271-1276 Link Here
1271		1283
1272	+ return exitcode;	1284	+ return exitcode;
1273	}	1285	}
		1286	{
		1287	printf ("NOSTATUS\n");
		1288	}
1274	--- pr/tests/semaerr.c.orig 2015-10-16 13:22:19 UTC	1289	--- pr/tests/semaerr.c.orig 2015-10-16 13:22:19 UTC
1275	+++ pr/tests/semaerr.c	1290	+++ pr/tests/semaerr.c
1276	@@ -65,7 +65,7 @@ int main(int argc, char **argv)	1291	@@ -65,7 +65,7 @@ int main(int argc, char **argv)
Lines 1340-1345 Link Here
1340		1355
1341		1356
1342	static void Measure(void (func)(void), const char msg)	1357	static void Measure(void (func)(void), const char msg)
		1358	ServerScope = PR_LOCAL_THREAD;
		1359	static void Measure(void (func)(void), const char msg)
1343	--- pr/tests/servr_kk.c.orig 2015-10-16 13:22:19 UTC	1360	--- pr/tests/servr_kk.c.orig 2015-10-16 13:22:19 UTC
1344	+++ pr/tests/servr_kk.c	1361	+++ pr/tests/servr_kk.c
1345	@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;	1362	@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
Lines 1367-1372 Link Here
1367		1384
1368	static void do_workKK(void)	1385	static void do_workKK(void)
1369	{	1386	{
		1387	ServerScope = PR_LOCAL_THREAD;
		1388	{
1370	--- pr/tests/servr_ku.c.orig 2015-10-16 13:22:19 UTC	1389	--- pr/tests/servr_ku.c.orig 2015-10-16 13:22:19 UTC
1371	+++ pr/tests/servr_ku.c	1390	+++ pr/tests/servr_ku.c
1372	@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;	1391	@@ -57,7 +57,7 @@ PRCondVar *ServerStateCV;
Lines 2126-2131 Link Here
2126	#endif	2145	#endif
2127	#if defined(XP_UNIX) \|\| defined(XP_OS2)	2146	#if defined(XP_UNIX) \|\| defined(XP_OS2)
2128	while ((opt = getopt(argc, argv, "d")) != EOF) {	2147	while ((opt = getopt(argc, argv, "d")) != EOF) {
		2148
2129	--- pr/tests/threads.c.orig 2015-10-16 13:22:19 UTC	2149	--- pr/tests/threads.c.orig 2015-10-16 13:22:19 UTC
2130	+++ pr/tests/threads.c	2150	+++ pr/tests/threads.c
2131	@@ -27,7 +27,7 @@ void	2151	@@ -27,7 +27,7 @@ void
Lines 2299-2304 Link Here
2299	} /* main */	2319	} /* main */
2300		2320
2301	/* thruput.c */	2321	/* thruput.c */
		2322	/* thruput.c */
2302	--- pr/tests/timemac.c.orig 2015-10-16 13:22:19 UTC	2323	--- pr/tests/timemac.c.orig 2015-10-16 13:22:19 UTC
2303	+++ pr/tests/timemac.c	2324	+++ pr/tests/timemac.c
2304	@@ -24,7 +24,7 @@ static void printExplodedTime(const PREx	2325	@@ -24,7 +24,7 @@ static void printExplodedTime(const PREx