|
@@ -1,5 +1,6 @@
|
|
|
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Feb 16 09:12:55 2002
|
|
|
|
|
-+++ nsprpub/pr/include/md/_freebsd.h Thu Aug 8 19:31:23 2002
|
|
|
|
|
|
|
+diff -Naur mozilla.orig/nsprpub/pr/include/md/_freebsd.h mozilla/nsprpub/pr/include/md/_freebsd.h
|
|
|
|
|
+--- mozilla.orig/nsprpub/pr/include/md/_freebsd.h 2003-01-17 00:09:12.000000000 +0100
|
|
|
|
|
++++ mozilla/nsprpub/pr/include/md/_freebsd.h 2003-10-16 18:54:05.000000000 +0200
|
|
|
@@ -40,6 +40,7 @@
|
|
@@ -40,6 +40,7 @@
|
|
|
#if __FreeBSD__ >= 2
|
|
#if __FreeBSD__ >= 2
|
|
|
#include <osreldate.h> /* for __FreeBSD_version */
|
|
#include <osreldate.h> /* for __FreeBSD_version */
|
|
@@ -8,28 +9,9 @@
|
|
|
#include <sys/syscall.h>
|
|
#include <sys/syscall.h>
|
|
|
|
|
|
|
|
#define PR_LINKER_ARCH "freebsd"
|
|
#define PR_LINKER_ARCH "freebsd"
|
|
|
---- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
|
|
|
|
|
-+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
|
|
|
|
|
-@@ -3414,6 +3414,17 @@
|
|
|
|
|
- if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
|
|
|
|
|
-+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
|
|
|
|
|
-+ if (domain == PR_AF_INET6) {
|
|
|
|
|
-+ int opt = 0;
|
|
|
|
|
-+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
|
|
|
|
|
-+ &opt, sizeof(opt))) {
|
|
|
|
|
-+ close(osfd);
|
|
|
|
|
-+ return NULL;
|
|
|
|
|
-+ }
|
|
|
|
|
-+ }
|
|
|
|
|
-+#endif
|
|
|
|
|
- fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
|
|
|
|
|
- if (fd == NULL) close(osfd);
|
|
|
|
|
- }
|
|
|
|
|
---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
|
|
|
|
|
-+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
|
|
|
|
|
|
|
+diff -Naur mozilla.orig/nsprpub/pr/src/md/unix/unix.c mozilla/nsprpub/pr/src/md/unix/unix.c
|
|
|
|
|
+--- mozilla.orig/nsprpub/pr/src/md/unix/unix.c 2002-12-12 01:19:57.000000000 +0100
|
|
|
|
|
++++ mozilla/nsprpub/pr/src/md/unix/unix.c 2003-10-16 19:02:04.000000000 +0200
|
|
|
@@ -65,7 +65,8 @@
|
|
@@ -65,7 +65,8 @@
|
|
|
* PRInt32* pointer to a _PRSockLen_t* pointer.
|
|
* PRInt32* pointer to a _PRSockLen_t* pointer.
|
|
|
*/
|
|
*/
|
|
@@ -49,3 +31,23 @@
|
|
|
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
|
|
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
|
|
|
|| defined(DGUX) || defined(VMS) || defined(NTO)
|
|
|| defined(DGUX) || defined(VMS) || defined(NTO)
|
|
|
#define _PRSockLen_t size_t
|
|
#define _PRSockLen_t size_t
|
|
|
|
|
+diff -Naur mozilla.orig/nsprpub/pr/src/pthreads/ptio.c mozilla/nsprpub/pr/src/pthreads/ptio.c
|
|
|
|
|
+--- mozilla.orig/nsprpub/pr/src/pthreads/ptio.c 2003-07-14 23:59:47.000000000 +0200
|
|
|
|
|
++++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2003-10-16 18:59:28.000000000 +0200
|
|
|
|
|
+@@ -3469,6 +3469,16 @@
|
|
|
|
|
+ (void)setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
|
|
|
|
|
+ &on, sizeof(on));
|
|
|
|
|
+ }
|
|
|
|
|
++#elif (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
|
|
|
|
|
++ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
|
|
|
|
|
++ if (domain == PR_AF_INET6) {
|
|
|
|
|
++ int opt = 0;
|
|
|
|
|
++ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
|
|
|
|
|
++ &opt, sizeof(opt))) {
|
|
|
|
|
++ close(osfd);
|
|
|
|
|
++ return NULL;
|
|
|
|
|
++ }
|
|
|
|
|
++ }
|
|
|
|
|
+ #endif
|
|
|
|
|
+ fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
|
|
|
|
|
+ if (fd == NULL) close(osfd);
|