Backout b02402b95e5c (bug 708277) for build failures on all platforms
authorEd Morley <bmo@edmorley.co.uk>
Thu, 22 Dec 2011 11:07:12 +0000
changeset 83249 cf7878e0d886ed4ba2ea29073a69a6f006ff67b9
parent 83248 7eb0c2f08597cb12dda6f124ee086c892f252674
child 83250 2f0774cdabf4fee4f95fd3398c7050e75902fd5e
push id21744
push userbmo@edmorley.co.uk
push dateFri, 23 Dec 2011 23:56:40 +0000
treeherdermozilla-central@ede336ccaed0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs708277
milestone12.0a1
backs outb02402b95e5cbfa6058d5ecae230604f64ed5fe4
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
Backout b02402b95e5c (bug 708277) for build failures on all platforms
content/media/nsBuiltinDecoderStateMachine.cpp
netwerk/cache/nsMemoryCacheDevice.cpp
xpcom/glue/pldhash.cpp
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -2110,17 +2110,17 @@ nsresult nsBuiltinDecoderStateMachine::S
 nsresult nsBuiltinDecoderStateMachine::ScheduleStateMachine(PRInt64 aUsecs) {
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
   NS_ABORT_IF_FALSE(GetStateMachineThread(),
     "Must have a state machine thread to schedule");
 
   if (mState == DECODER_STATE_SHUTDOWN) {
     return NS_ERROR_FAILURE;
   }
-  aUsecs = NS_MAX(aUsecs, 0);
+  aUsecs = PR_MAX(aUsecs, 0);
 
   TimeStamp timeout = TimeStamp::Now() + UsecsToDuration(aUsecs);
   if (!mTimeout.IsNull()) {
     if (timeout >= mTimeout) {
       // We've already scheduled a timer set to expire at or before this time,
       // or have an event dispatched to run the state machine.
       return NS_OK;
     }
--- a/netwerk/cache/nsMemoryCacheDevice.cpp
+++ b/netwerk/cache/nsMemoryCacheDevice.cpp
@@ -405,17 +405,17 @@ nsMemoryCacheDevice::EvictEntriesIfNeces
             while ((entry != &mEvictionList[i]) &&
                    (entry->IsInUse())) {
                 entry = (nsCacheEntry *)PR_NEXT_LINK(entry);
             }
 
             if (entry != &mEvictionList[i]) {
                 entryCost = (PRUint64)
                     (now - entry->LastFetched()) * entry->Size() / 
-                    NS_MAX(1, entry->FetchCount());
+                    PR_MAX(1, entry->FetchCount());
                 if (!maxEntry || (entryCost > maxCost)) {
                     maxEntry = entry;
                     maxCost = entryCost;
                 }
             }
         }
         if (maxEntry) {
             EvictEntry(maxEntry, DELETE_ENTRY);
--- a/xpcom/glue/pldhash.cpp
+++ b/xpcom/glue/pldhash.cpp
@@ -305,30 +305,30 @@ PL_DHashTableSetAlphaBounds(PLDHashTable
      * Ensure that at least one entry will always be free.  If maxAlpha at
      * minimum size leaves no entries free, reduce maxAlpha based on minimum
      * size and the precision limit of maxAlphaFrac's fixed point format.
      */
     NS_ASSERTION(PL_DHASH_MIN_SIZE - (maxAlpha * PL_DHASH_MIN_SIZE) >= 1,
                  "PL_DHASH_MIN_SIZE - (maxAlpha * PL_DHASH_MIN_SIZE) >= 1");
     if (PL_DHASH_MIN_SIZE - (maxAlpha * PL_DHASH_MIN_SIZE) < 1) {
         maxAlpha = (float)
-                   (PL_DHASH_MIN_SIZE - NS_MAX(PL_DHASH_MIN_SIZE / 256, 1))
+                   (PL_DHASH_MIN_SIZE - PR_MAX(PL_DHASH_MIN_SIZE / 256, 1))
                    / PL_DHASH_MIN_SIZE;
     }
 
     /*
      * Ensure that minAlpha is strictly less than half maxAlpha.  Take care
      * not to truncate an entry's worth of alpha when storing in minAlphaFrac
      * (8-bit fixed point format).
      */
     NS_ASSERTION(minAlpha < maxAlpha / 2,
                  "minAlpha < maxAlpha / 2");
     if (minAlpha >= maxAlpha / 2) {
         size = PL_DHASH_TABLE_SIZE(table);
-        minAlpha = (size * maxAlpha - NS_MAX(size / 256, 1)) / (2 * size);
+        minAlpha = (size * maxAlpha - PR_MAX(size / 256, 1)) / (2 * size);
     }
 
     table->maxAlphaFrac = (PRUint8)(maxAlpha * 256);
     table->minAlphaFrac = (PRUint8)(minAlpha * 256);
 }
 
 /*
  * Double hashing needs the second hash code to be relatively prime to table