mozilla.patch 2.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. diff -Naur mozilla.orig/nsprpub/pr/include/md/_freebsd.h mozilla/nsprpub/pr/include/md/_freebsd.h
  2. --- mozilla.orig/nsprpub/pr/include/md/_freebsd.h 2003-01-17 00:09:12.000000000 +0100
  3. +++ mozilla/nsprpub/pr/include/md/_freebsd.h 2003-10-16 18:54:05.000000000 +0200
  4. @@ -40,6 +40,7 @@
  5. #if __FreeBSD__ >= 2
  6. #include <osreldate.h> /* for __FreeBSD_version */
  7. #endif
  8. +#include <sys/param.h>
  9. #include <sys/syscall.h>
  10. #define PR_LINKER_ARCH "freebsd"
  11. diff -Naur mozilla.orig/nsprpub/pr/src/md/unix/unix.c mozilla/nsprpub/pr/src/md/unix/unix.c
  12. --- mozilla.orig/nsprpub/pr/src/md/unix/unix.c 2002-12-12 01:19:57.000000000 +0100
  13. +++ mozilla/nsprpub/pr/src/md/unix/unix.c 2003-10-16 19:02:04.000000000 +0200
  14. @@ -65,7 +65,8 @@
  15. * PRInt32* pointer to a _PRSockLen_t* pointer.
  16. */
  17. #if defined(HAVE_SOCKLEN_T) \
  18. - || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
  19. + || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
  20. + || defined(FREEBSD)
  21. #define _PRSockLen_t socklen_t
  22. #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
  23. || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
  24. @@ -73,7 +74,7 @@
  25. || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
  26. || defined(NEXTSTEP) || defined(QNX)
  27. #define _PRSockLen_t int
  28. -#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
  29. +#elif (defined(AIX) && !defined(AIX4_1)) \
  30. || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
  31. || defined(DGUX) || defined(VMS) || defined(NTO)
  32. #define _PRSockLen_t size_t
  33. diff -Naur mozilla.orig/nsprpub/pr/src/pthreads/ptio.c mozilla/nsprpub/pr/src/pthreads/ptio.c
  34. --- mozilla.orig/nsprpub/pr/src/pthreads/ptio.c 2003-07-14 23:59:47.000000000 +0200
  35. +++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2003-10-16 18:59:28.000000000 +0200
  36. @@ -3469,6 +3469,16 @@
  37. (void)setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
  38. &on, sizeof(on));
  39. }
  40. +#elif (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
  41. + defined(__FreeBSD__) && defined(IPV6_V6ONLY)
  42. + if (domain == PR_AF_INET6) {
  43. + int opt = 0;
  44. + if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
  45. + &opt, sizeof(opt))) {
  46. + close(osfd);
  47. + return NULL;
  48. + }
  49. + }
  50. #endif
  51. fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
  52. if (fd == NULL) close(osfd);