Bug 661584 - Substitute final PR_(MAX|MIN|ABS|ROUNDUP) macro calls; r=roc

gfx/src/nsRegion.cpp

@@ -88,8 +88,8 @@ inline void nsRegion::nsRectFast::UnionRect (const nsRect& aRect1, const nsRect&
 {
   const nscoord xmost = NS_MAX (aRect1.XMost (), aRect2.XMost ());
   const nscoord ymost = NS_MAX (aRect1.YMost (), aRect2.YMost ());
-  x = PR_MIN (aRect1.x, aRect2.x);
-  y = PR_MIN (aRect1.y, aRect2.y);
+  x = NS_MIN(aRect1.x, aRect2.x);
+  y = NS_MIN(aRect1.y, aRect2.y);
   width  = xmost - x;
   height = ymost - y;
 }

layout/base/nsBidiPresUtils.cpp

@@ -805,13 +805,13 @@ nsBidiPresUtils::TraverseFrames(nsBlockFrame*              aBlockFrame,
                * into the next continuation
                */
               mBuffer.Append(Substring(text, start,
-                                       PR_MIN(end, endLine) - start));
+                                       NS_MIN(end, endLine) - start));
               while (end < endLine && nextSibling) { 
                 AdvanceAndAppendFrame(&frame, aLineIter, &nextSibling);
                 NS_ASSERTION(frame, "Premature end of continuation chain");
                 frame->GetOffsets(start, end);
                 mBuffer.Append(Substring(text, start,
-                                         PR_MIN(end, endLine) - start));
+                                         NS_MIN(end, endLine) - start));
               }
 
               PRBool createdContinuation = PR_FALSE;

layout/base/nsPresShell.cpp

@@ -56,7 +56,6 @@
 
 /* a presentation of a document, part 2 */
 
-#include "nsAlgorithm.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsIContent.h"
@@ -130,6 +129,7 @@
 #include "nsCSSRendering.h"
   // for |#ifdef DEBUG| code
 #include "prenv.h"
+#include "nsAlgorithm.h"
 #include "nsIAttribute.h"
 #include "nsIGlobalHistory2.h"
 #include "nsDisplayList.h"