Bug 530385 - Replace PR_MIN/PR_MAX with NS_MIN/NS_MAX in toolkit/components/places, r=mak77

toolkit/components/places/src/nsFaviconService.cpp

@@ -1290,7 +1290,7 @@ FaviconLoadListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
       rv = cacheEntry->GetExpirationTime(&seconds);
       if (NS_SUCCEEDED(rv)) {
         // Set the expiration, but make sure we honor our cap.
-        expiration = PR_Now() + PR_MIN(seconds * PR_USEC_PER_SEC,
+        expiration = PR_Now() + NS_MIN((PRTime)seconds * PR_USEC_PER_SEC,
                                        MAX_FAVICON_EXPIRATION);
       }
     }

toolkit/components/places/src/nsNavHistory.cpp

@@ -186,7 +186,7 @@ using namespace mozilla::places;
 // We use a guess of the number of months considering all of them 30 days
 // long, but we split only the last 6 months.
 #define DATE_CONT_NUM(_expireDays) \
-  (ADDITIONAL_DATE_CONT_NUM + PR_MIN(6, (_expireDays/30)))
+  (ADDITIONAL_DATE_CONT_NUM + NS_MIN(6, (_expireDays/30)))
 
 // fraction of free pages in the database to force a vacuum between
 // MAX_TIME_BEFORE_VACUUM and MIN_TIME_BEFORE_VACUUM.