From owner-freebsd-gecko@FreeBSD.ORG Sun Aug 12 13:32:19 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 A32D3106564A for ; Sun, 12 Aug 2012 13:32:19 +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 171238FC08 for ; Sun, 12 Aug 2012 13:32:18 +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 q7CDWHI4038247 for ; Sun, 12 Aug 2012 13:32:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7CDWCuH037521 for freebsd-gecko@freebsd.org; Sun, 12 Aug 2012 13:32:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 12 Aug 2012 13:32:12 GMT Message-Id: <201208121332.q7CDWCuH037521@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] r924 - branches/experimental/devel/nspr/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: Sun, 12 Aug 2012 13:32:19 -0000 Author: jbeich Date: Sun Aug 12 13:32:12 2012 New Revision: 924 Log: better conflict with bug#782109 Added: branches/experimental/devel/nspr/files/patch-bug782109 Modified: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Modified: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h ============================================================================== --- branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Sat Aug 11 04:50:58 2012 (r923) +++ branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Sun Aug 12 13:32:12 2012 (r924) @@ -11,20 +11,3 @@ #else #error "Unknown CPU architecture" #endif -@@ -106,6 +110,16 @@ - #define _PR_IPV6_V6ONLY_PROBE - #endif - -+#if (__FreeBSD_version >= 700016) -+#if defined(_PR_PTHREADS) -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#define _PR_HAVE_GETHOST_R -+#define _PR_HAVE_GETHOST_R_INT -+#define _PR_HAVE_THREADSAFE_GETHOST -+#endif -+#endif -+ - #define USE_SETJMP - - #ifndef _PR_PTHREADS Added: branches/experimental/devel/nspr/files/patch-bug782109 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/devel/nspr/files/patch-bug782109 Sun Aug 12 13:32:12 2012 (r924) @@ -0,0 +1,31 @@ +--- ../pr/include/md/_freebsd.h~ ++++ ../pr/include/md/_freebsd.h +@@ -47,6 +47,14 @@ + #define _PR_HAVE_LARGE_OFF_T + + #if defined(_PR_PTHREADS) ++#if __FreeBSD_version >= 602000 ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_5_ARG_GETPROTO_R ++#endif ++#if __FreeBSD_version >= 700016 ++#define _PR_HAVE_GETHOST_R ++#define _PR_HAVE_GETHOST_R_INT ++#endif + #if __FreeBSD_version >= 400008 + /* + * libc_r before this version of FreeBSD doesn't have poll(). +--- ../pr/src/misc/prnetdb.c ++++ ../pr/src/misc/prnetdb.c +@@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL; + #define _PR_HAVE_GETPROTO_R_INT + #endif + +-#if __FreeBSD_version >= 602000 +-#define _PR_HAVE_GETPROTO_R +-#define _PR_HAVE_5_ARG_GETPROTO_R +-#endif +- + /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ + #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) + #define _PR_HAVE_GETPROTO_R