Date: Wed, 28 Sep 2011 18:30:54 +0200 From: =?iso-8859-1?Q?Beat_G=E4tzi?= <beat@FreeBSD.org> To: h h <aakuusta@gmail.com> Cc: freebsd-gecko@FreeBSD.org Subject: Re: [SVN-Commit] r628 - branches/experimental/Mk branches/experimental/www/firefox branches/experimental/www/firefox-i18n branches/experimental/www/firefox/files branches/experimental/www/linux-firefox trunk/Mk trunk/www/firefox trunk/www/firefox-i18n trunk/www/firefox/files trunk/www/linux-firefox Message-ID: <87E83CA3-4339-4D08-B65B-65E602535C8C@FreeBSD.org> In-Reply-To: <86k48tbq92.fsf@gmail.com> References: <201109271557.p8RFvhkB091814@trillian.chruetertee.ch> <86k48tbq92.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sep 27, 2011, at 11:59 PM, h h wrote:
> svn-freebsd-gecko@chruetertee.ch writes:
>
>> Author: beat
>> Date: Tue Sep 27 15:57:43 2011
>> New Revision: 628
>>
>> Log:
>> - Update Firefox to 7.0
> [...]
>> Added: branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
>> ==============================================================================
>> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
>> +++ branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 27 15:57:43 2011 (r628)
>> @@ -0,0 +1,13 @@
>> +--- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
>> ++++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
>> +@@ -89,6 +89,10 @@
>> + nsresult
>> + nsThreadManager::Init()
>> + {
>> ++#ifdef NS_TLS
>> ++ if (!gTLSThreadID)
>> ++ gTLSThreadID = mozilla::threads::Generic;
>> ++#endif
>> + if (!mThreadsByPRThread.Init())
>> + return NS_ERROR_OUT_OF_MEMORY;
>> +
>>
>
> So, are you going to keep workaround unconditionally?
No, I was not aware that the patch wasn't complete. I committed your patch
a couple of minutes ago.
Thanks,
Beat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87E83CA3-4339-4D08-B65B-65E602535C8C>