From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 13:23:30 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 DBE1A1065670 for ; Mon, 3 Sep 2012 13:23:30 +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 6B5628FC08 for ; Mon, 3 Sep 2012 13:23:30 +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 q83DNSWX094508 for ; Mon, 3 Sep 2012 13:23:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83DNNej093906 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 13:23:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 13:23:23 GMT Message-Id: <201209031323.q83DNNej093906@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] r976 - trunk/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: Mon, 03 Sep 2012 13:23:31 -0000 Author: jbeich Date: Mon Sep 3 13:23:23 2012 New Revision: 976 Log: backout, non-pthread builds are too broken Modified: trunk/devel/nspr/files/patch-bug301986 trunk/devel/nspr/files/patch-bug782109 Modified: trunk/devel/nspr/files/patch-bug301986 ============================================================================== --- trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 12:19:11 2012 (r975) +++ trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 13:23:23 2012 (r976) @@ -33,14 +33,3 @@ + return thred->id; /* and I don't know what they will do with it */ #endif } ---- ../pr/src/threads/prcthr.c~ -+++ ../pr/src/threads/prcthr.c -@@ -127,7 +127,7 @@ PR_IMPLEMENT(PRStatus) PR_Sleep(PRInterv - return rv; - } - --PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thread) -+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thread) - { - return thread->id; - } Modified: trunk/devel/nspr/files/patch-bug782109 ============================================================================== --- trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 12:19:11 2012 (r975) +++ trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 13:23:23 2012 (r976) @@ -29,14 +29,3 @@ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R ---- ../pr/src/misc/prnetdb.c~ -+++ ../pr/src/misc/prnetdb.c -@@ -1149,7 +1149,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr( - * any usable implementation. - */ - --#if defined(ANDROID) -+#if defined(ANDROID) || defined(FREEBSD) - /* Android's Bionic libc system includes prototypes for these in netdb.h, - * but doesn't actually include implementations. It uses the 5-arg form, - * so these functions end up not matching the prototype. So just rename