diff options
Diffstat (limited to 'mail/thunderbird/patches/patch-bf')
| -rw-r--r-- | mail/thunderbird/patches/patch-bf | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/mail/thunderbird/patches/patch-bf b/mail/thunderbird/patches/patch-bf index faeef997073..b85fde113c4 100644 --- a/mail/thunderbird/patches/patch-bf +++ b/mail/thunderbird/patches/patch-bf @@ -1,42 +1,22 @@ -$NetBSD: patch-bf,v 1.1 2010/07/12 16:49:22 tnn Exp $ +$NetBSD: patch-bf,v 1.2 2011/08/19 14:39:09 tnn Exp $ ---- mozilla/js/ctypes/libffi/src/mips/ffitarget.h.orig 2010-03-31 04:09:31.000000000 -0400 -+++ mozilla/js/ctypes/libffi/src/mips/ffitarget.h 2010-03-31 04:12:52.000000000 -0400 -@@ -29,15 +29,28 @@ +--- mozilla/js/src/jsnativestack.cpp.orig 2011-08-11 21:41:05.000000000 +0000 ++++ mozilla/js/src/jsnativestack.cpp +@@ -50,7 +50,7 @@ + #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) + # include <pthread.h> - #ifdef linux - #include <asm/sgidefs.h> --# ifndef _ABIN32 --# define _ABIN32 _MIPS_SIM_NABI32 --# endif --# ifndef _ABI64 --# define _ABI64 _MIPS_SIM_ABI64 --# endif --# ifndef _ABIO32 --# define _ABIO32 _MIPS_SIM_ABI32 --# endif -+#elif defined(irix) -+#include <sgidefs.h> -+#else -+#include <sys/cdefs.h> -+#endif -+ -+#ifndef _ABIN32 -+# define _ABIN32 _MIPS_SIM_NABI32 -+#endif -+#ifndef _ABI64 -+# define _ABI64 _MIPS_SIM_ABI64 -+#endif -+#ifndef _ABIO32 -+# define _ABIO32 _MIPS_SIM_ABI32 -+#endif -+ -+#ifndef _MIPS_SIM -+# ifdef _MIPS_BSD_API -+# define _MIPS_SIM _MIPS_BSD_API -+# else -+# define _MIPS_SIM _ABIO32 -+# endif - #endif +-# if defined(__FreeBSD__) || defined(__OpenBSD__) ++# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + # include <pthread_np.h> + # endif - #if !defined(_MIPS_SIM) +@@ -145,7 +145,7 @@ GetNativeStackBaseImpl() + pthread_attr_init(&sattr); + # if defined(__OpenBSD__) + stack_t ss; +-# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) ++# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */ + /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */ + pthread_attr_get_np(thread, &sattr); + # else |