Date: Mon, 3 Sep 2012 12:19:11 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r975 - trunk/devel/nspr/files Message-ID: <201209031219.q83CJBJN066959@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Sep 3 12:19:11 2012 New Revision: 975 Log: unbreak --enable-nspr-threads 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 11:59:18 2012 (r974) +++ trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 12:19:11 2012 (r975) @@ -33,3 +33,14 @@ + 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 11:59:18 2012 (r974) +++ trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 12:19:11 2012 (r975) @@ -29,3 +29,14 @@ /* 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209031219.q83CJBJN066959>