summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug543241
blob: 362e47ffe2d671ea3756bca21558f6c5dce2faa8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
--- ./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
@@ -12,6 +12,10 @@
 #include "nsAutoPtr.h"
 #include "nsCycleCollectorUtils.h"
 
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#endif
+
 using namespace mozilla;
 
 #ifdef XP_WIN
@@ -57,6 +57,11 @@
 nsresult
 nsThreadManager::Init()
 {
+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
+  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
+  if (!gTLSThreadID)
+    gTLSThreadID = mozilla::threads::Generic;
+#endif
   mThreadsByPRThread.Init();
 
   if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)