|
|
@@ -1,7 +1,7 @@
|
|
|
Index: mozilla/nsprpub/pr/include/md/_freebsd.h
|
|
|
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2003-01-16 17:16:27 +0100
|
|
|
-+++ mozilla/nsprpub/pr/include/md/_freebsd.h 2004-12-27 19:50:46 +0100
|
|
|
-@@ -40,6 +40,7 @@
|
|
|
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2004-11-22 22:24:53 +0100
|
|
|
++++ mozilla/nsprpub/pr/include/md/_freebsd.h 2005-07-13 15:42:26 +0200
|
|
|
+@@ -43,6 +43,7 @@
|
|
|
#if __FreeBSD__ >= 2
|
|
|
#include <osreldate.h> /* for __FreeBSD_version */
|
|
|
#endif
|
|
|
@@ -10,20 +10,29 @@ Index: mozilla/nsprpub/pr/include/md/_freebsd.h
|
|
|
|
|
|
#define PR_LINKER_ARCH "freebsd"
|
|
|
Index: mozilla/nsprpub/pr/include/md/_pth.h
|
|
|
---- mozilla/nsprpub/pr/include/md/_pth.h.orig 2002-12-12 00:10:39 +0100
|
|
|
-+++ mozilla/nsprpub/pr/include/md/_pth.h 2004-12-27 19:52:48 +0100
|
|
|
-@@ -90,7 +90,7 @@
|
|
|
- #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init
|
|
|
- #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy
|
|
|
- #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a))
|
|
|
+--- mozilla/nsprpub/pr/include/md/_pth.h.orig 2004-11-22 22:24:53 +0100
|
|
|
++++ mozilla/nsprpub/pr/include/md/_pth.h 2005-07-13 15:43:47 +0200
|
|
|
+@@ -84,7 +84,7 @@
|
|
|
+ #define _PT_PTHREAD_MUTEXATTR_DESTROY(x) /* */
|
|
|
+ #define _PT_PTHREAD_MUTEX_INIT(m, a) (memset(&(m), 0, sizeof(m)), \
|
|
|
+ pthread_mutex_init(&(m), NULL))
|
|
|
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
|
|
|
+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
|
|
|
- #if defined(DARWIN)
|
|
|
#define _PT_PTHREAD_CONDATTR_INIT(x) 0
|
|
|
+ #define _PT_PTHREAD_CONDATTR_DESTROY(x) /* */
|
|
|
+ #define _PT_PTHREAD_COND_INIT(m, a) (memset(&(m), 0, sizeof(m)), \
|
|
|
+@@ -96,7 +96,7 @@
|
|
|
+ #if defined(FREEBSD)
|
|
|
+ #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) pt_pthread_mutex_is_locked(&(m))
|
|
|
#else
|
|
|
+-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
|
|
|
++#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
|
|
|
+ #endif
|
|
|
+ #if defined(DARWIN)
|
|
|
+ #define _PT_PTHREAD_CONDATTR_INIT(x) 0
|
|
|
Index: mozilla/nsprpub/pr/src/md/unix/unix.c
|
|
|
---- mozilla/nsprpub/pr/src/md/unix/unix.c.orig 2002-12-12 00:03:31 +0100
|
|
|
-+++ mozilla/nsprpub/pr/src/md/unix/unix.c 2004-12-27 19:50:46 +0100
|
|
|
+--- mozilla/nsprpub/pr/src/md/unix/unix.c.orig 2005-03-09 23:57:05 +0100
|
|
|
++++ mozilla/nsprpub/pr/src/md/unix/unix.c 2005-07-13 15:42:26 +0200
|
|
|
@@ -65,7 +65,8 @@
|
|
|
* PRInt32* pointer to a _PRSockLen_t* pointer.
|
|
|
*/
|
|
|
@@ -44,36 +53,9 @@ Index: mozilla/nsprpub/pr/src/md/unix/unix.c
|
|
|
|| defined(DGUX) || defined(VMS) || defined(NTO)
|
|
|
#define _PRSockLen_t size_t
|
|
|
Index: mozilla/nsprpub/pr/src/pthreads/ptio.c
|
|
|
---- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig 2003-07-15 00:12:19 +0200
|
|
|
-+++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2004-12-27 19:54:28 +0100
|
|
|
-@@ -189,7 +189,7 @@
|
|
|
- #endif
|
|
|
- #endif
|
|
|
-
|
|
|
--#ifdef DARWIN
|
|
|
-+#if defined(DARWIN) || defined(FREEBSD)
|
|
|
- static PRBool _pr_ipv6_v6only_on_by_default;
|
|
|
- /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
|
|
|
- #ifndef IPV6_V6ONLY
|
|
|
-@@ -1154,7 +1154,7 @@
|
|
|
- _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
|
|
|
- PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
|
|
|
-
|
|
|
--#ifdef DARWIN
|
|
|
-+#if defined(DARWIN) || defined(FREEBSD)
|
|
|
- /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
|
|
|
- * is turned on by default, contrary to what RFC 3493, Section
|
|
|
- * 5.3 says. So we have to turn it off. Find out whether we
|
|
|
-@@ -3462,7 +3462,7 @@
|
|
|
- if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
|
|
|
- else
|
|
|
- {
|
|
|
--#ifdef DARWIN
|
|
|
-+#if defined(DARWIN) || defined(FREEBSD)
|
|
|
- if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
|
|
|
- {
|
|
|
- int on = 0;
|
|
|
-@@ -3470,6 +3470,17 @@
|
|
|
+--- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig 2005-03-09 23:57:06 +0100
|
|
|
++++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2005-07-13 15:42:26 +0200
|
|
|
+@@ -3471,6 +3471,17 @@
|
|
|
&on, sizeof(on));
|
|
|
}
|
|
|
#endif
|
