From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 1 14:00:14 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E94FA106564A for ; Wed, 1 Aug 2012 14:00:14 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 58BA58FC0A for ; Wed, 1 Aug 2012 14:00:13 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q71E077r093915 for ; Wed, 1 Aug 2012 14:00:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q71E01ZU092554 for freebsd-gecko@freebsd.org; Wed, 1 Aug 2012 14:00:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 1 Aug 2012 14:00:01 GMT Message-Id: <201208011400.q71E01ZU092554@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r905 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2012 14:00:15 -0000 Author: jbeich Date: Wed Aug 1 14:00:01 2012 New Revision: 905 Log: - use SysV shared memory for plugins - and sync with other minor changes from bug#753046 Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 branches/experimental/mail/thunderbird/files/patch-bug753046 branches/experimental/www/firefox-esr/files/patch-bug753046 branches/experimental/www/firefox-nightly/files/patch-bug753046 branches/experimental/www/firefox/files/patch-bug753046 branches/experimental/www/libxul/files/patch-bug753046 branches/experimental/www/seamonkey/files/patch-bug753046 Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -528,18 +528,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -638,7 +626,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,324 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -647,7 +635,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -684,8 +671,7 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1250,6 +1236,19 @@ newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- mozilla/ipc/glue/SharedMemorySysV.h ++++ mozilla/ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -533,18 +533,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -643,7 +631,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,324 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -652,7 +640,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -689,8 +676,7 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1255,6 +1241,19 @@ newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- mozilla/ipc/glue/SharedMemorySysV.h ++++ mozilla/ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 Modified: branches/experimental/www/firefox-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/www/firefox-esr/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -528,18 +528,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -638,7 +626,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,324 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -647,7 +635,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -684,8 +671,7 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1250,6 +1236,19 @@ newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- ipc/glue/SharedMemorySysV.h ++++ ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -533,18 +533,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -665,7 +653,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,367 @@ +@@ -0,0 +1,371 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -674,7 +662,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -716,11 +703,16 @@ + * UID. This is generally the UID for user `nobody', albeit it is not + * always the case. + */ ++ ++#if defined(OS_NETBSD) || defined(OS_OPENBSD) ++# define CHILD_UNPRIVILEGED_UID 32767 ++# define CHILD_UNPRIVILEGED_GID 32767 ++#else +# define CHILD_UNPRIVILEGED_UID 65534 +# define CHILD_UNPRIVILEGED_GID 65534 ++#endif + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1269,6 +1261,19 @@ newEnvVars, privs, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- ipc/glue/SharedMemorySysV.h ++++ ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/www/firefox/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -533,18 +533,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -643,7 +631,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,324 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -652,7 +640,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -689,8 +676,7 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1255,6 +1241,19 @@ newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- ipc/glue/SharedMemorySysV.h ++++ ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/www/libxul/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -528,18 +528,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -638,7 +626,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,324 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -647,7 +635,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -684,8 +671,7 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1250,6 +1236,19 @@ newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- ipc/glue/SharedMemorySysV.h ++++ ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000 Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Tue Jul 31 13:55:47 2012 (r904) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Wed Aug 1 14:00:01 2012 (r905) @@ -533,18 +533,6 @@ pump_ = new base::MessagePumpForUI(); #endif // OS_LINUX } else if (type_ == TYPE_IO) { -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $ - ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include - #endif -+#include /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 @@ -643,7 +631,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,324 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -652,7 +640,6 @@ + +#include "base/process_util.h" + -+#include +#include +#include +#include @@ -689,8 +676,7 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \ -+ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205 ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + @@ -1255,6 +1241,19 @@ newEnvVars, #endif false, &process, arch); +diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h +index f37998d..b05dc7b 100644 +--- mozilla/ipc/glue/SharedMemorySysV.h ++++ mozilla/ipc/glue/SharedMemorySysV.h +@@ -8,7 +8,7 @@ + #ifndef mozilla_ipc_SharedMemorySysV_h + #define mozilla_ipc_SharedMemorySysV_h + +-#if defined(OS_LINUX) && !defined(ANDROID) ++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) + + // SysV shared memory isn't available on Windows, but we define the + // following macro so that #ifdefs are clearer (compared to #ifdef $NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $ --- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000