Author: jbeich Date: Tue Aug 28 19:47:04 2012 New Revision: 960 Log: get rid of extra sys/param.h
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 Aug 28 19:25:45 2012 (r959) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -553,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,322 @@ +@@ -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. @@ -583,13 +583,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +#ifndef __dso_public Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -581,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,322 @@ +@@ -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. @@ -611,13 +611,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +#ifndef __dso_public Modified: branches/experimental/www/firefox-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) +++ branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -553,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,322 @@ +@@ -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. @@ -583,13 +583,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +#ifndef __dso_public Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -566,7 +566,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,371 @@ +@@ -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. @@ -596,13 +596,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +/* Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) +++ branches/experimental/www/firefox/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -581,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,322 @@ +@@ -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. @@ -611,13 +611,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +#ifndef __dso_public Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) +++ branches/experimental/www/libxul/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -553,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,322 @@ +@@ -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. @@ -583,13 +583,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +#ifndef __dso_public Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Tue Aug 28 19:47:04 2012 (r960) @@ -581,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,322 @@ +@@ -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. @@ -611,13 +611,9 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ ++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) +#define HAVE_POSIX_SPAWN 1 -+#elif defined(OS_NETBSD) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 599006500 -+#define HAVE_POSIX_SPAWN 1 -+#endif +#endif + +#ifndef __dso_public _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
