Bug 1033358 - Fix linking of the AVOID_NSPR build - r=bsmedberg
☠☠ backed out by 1fd5a864e81d ☠ ☠
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 03 Jul 2014 14:53:22 -0400
changeset 192173 c571df9a85de14c34bab14c1bcd48303a326cb86
parent 192172 82210155467cd41aa704541c663e99db64fe464f
child 192174 7829c78348a4429a8362c0953ecf66d398fc8e95
push id45776
push userbjacob@mozilla.com
push dateThu, 03 Jul 2014 18:57:18 +0000
treeherdermozilla-inbound@a54b05c9e4a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1033358
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1033358 - Fix linking of the AVOID_NSPR build - r=bsmedberg
xpcom/glue/nsThreadUtils.cpp
--- a/xpcom/glue/nsThreadUtils.cpp
+++ b/xpcom/glue/nsThreadUtils.cpp
@@ -351,17 +351,19 @@ nsThreadPoolNaming::SetThreadPoolName(co
   name.AppendLiteral(" #");
   name.AppendInt(++mCounter, 10); // The counter is declared as volatile
 
   if (aThread) {
     // Set on the target thread
     NS_SetThreadName(aThread, name);
   } else {
     // Set on the current thread
+#ifndef XPCOM_GLUE_AVOID_NSPR
     PR_SetCurrentThreadName(name.BeginReading());
+#endif
   }
 }
 
 // nsAutoLowPriorityIO
 nsAutoLowPriorityIO::nsAutoLowPriorityIO()
 {
 #if defined(XP_WIN)
   lowIOPrioritySet = IsVistaOrLater() &&