From owner-freebsd-gecko@FreeBSD.ORG Tue Aug 28 15:24:13 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 25795106564A for ; Tue, 28 Aug 2012 15:24:13 +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 8C7BE8FC0A for ; Tue, 28 Aug 2012 15:24:12 +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 q7SFO50H081018 for ; Tue, 28 Aug 2012 15:24:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7SFNxWa078983 for freebsd-gecko@freebsd.org; Tue, 28 Aug 2012 15:23:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 28 Aug 2012 15:23:59 GMT Message-Id: <201208281523.q7SFNxWa078983@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] r952 - 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: Tue, 28 Aug 2012 15:24:13 -0000 Author: jbeich Date: Tue Aug 28 15:23:59 2012 New Revision: 952 Log: sync with 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 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -417,7 +417,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -512,19 +512,6 @@ #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif -diff --git mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -566,7 +553,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,320 @@ +@@ -0,0 +1,318 @@ +// 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. @@ -596,17 +583,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -1189,7 +1174,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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 Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -422,7 +422,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -536,22 +536,10 @@ pthread_set_name_np(pthread_self(), name); -#elif defined(__NetBSD__) +#elif defined(OS_NETBSD) - pthread_setname_np(pthread_self(), "%s", name); +- pthread_setname_np(pthread_self(), "%s", name); ++ pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); -diff --git mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -593,7 +581,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,320 @@ +@@ -0,0 +1,318 @@ +// 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. @@ -623,17 +611,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -1216,7 +1202,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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 Modified: branches/experimental/www/firefox-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-bug753046 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -417,7 +417,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -512,19 +512,6 @@ #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif -diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -566,7 +553,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,320 @@ +@@ -0,0 +1,318 @@ +// 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. @@ -596,17 +583,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -1189,7 +1174,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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 Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -422,7 +422,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -539,19 +539,6 @@ pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); -diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -593,7 +580,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,369 @@ +@@ -0,0 +1,367 @@ +// 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. @@ -623,17 +610,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +/* + * On platforms that are not gonk based, we fall back to an arbitrary + * UID. This is generally the UID for user `nobody', albeit it is not @@ -1214,7 +1199,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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 Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/www/firefox/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -422,7 +422,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -536,22 +536,10 @@ pthread_set_name_np(pthread_self(), name); -#elif defined(__NetBSD__) +#elif defined(OS_NETBSD) - pthread_setname_np(pthread_self(), "%s", name); +- pthread_setname_np(pthread_self(), "%s", name); ++ pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); -diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -593,7 +581,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,320 @@ +@@ -0,0 +1,318 @@ +// 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. @@ -623,17 +611,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -1216,7 +1202,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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 Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/www/libxul/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -417,7 +417,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -512,19 +512,6 @@ #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif -diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -566,7 +553,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,320 @@ +@@ -0,0 +1,318 @@ +// 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. @@ -596,17 +583,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -1189,7 +1174,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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 Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Fri Aug 24 12:37:14 2012 (r951) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Tue Aug 28 15:23:59 2012 (r952) @@ -422,7 +422,7 @@ // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef OS_LINUX ++#ifndef HAVE_STAT64 #define stat64 stat #endif @@ -536,22 +536,10 @@ pthread_set_name_np(pthread_self(), name); -#elif defined(__NetBSD__) +#elif defined(OS_NETBSD) - pthread_setname_np(pthread_self(), "%s", name); +- pthread_setname_np(pthread_self(), "%s", name); ++ pthread_setname_np(pthread_self(), "%s", (void *)name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); -diff --git mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -index 342e6d9..b011baf 100644 ---- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -+++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -593,7 +581,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,320 @@ +@@ -0,0 +1,318 @@ +// 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. @@ -623,17 +611,15 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef OS_NETBSD ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#elif defined(OS_NETBSD) +#include +#if __NetBSD_Version__ >= 599006500 +#define HAVE_POSIX_SPAWN 1 +#endif +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 -+#endif -+ +#ifndef __dso_public +# ifdef __exported +# define __dso_public __exported @@ -1216,7 +1202,7 @@ #define mozilla_ipc_SharedMemorySysV_h -#if defined(OS_LINUX) && !defined(ANDROID) -+#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD) ++#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