wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout b02402b95e5c (bug 708277) for build failures on all platforms

Browse Source
This commit is contained in:
Ed Morley 2011-12-22 11:07:12 +00:00
parent 537d5005e6
commit ea70443fc2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/media/nsBuiltinDecoderStateMachine.cpp
View File

@ -2115,7 +2115,7 @@ nsresult nsBuiltinDecoderStateMachine::ScheduleStateMachine(PRInt64 aUsecs) {
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()) {

2
netwerk/cache/nsMemoryCacheDevice.cpp vendored
View File

@ -410,7 +410,7 @@ nsMemoryCacheDevice::EvictEntriesIfNecessary(void)
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;

4
xpcom/glue/pldhash.cpp
View File

@ -310,7 +310,7 @@ PL_DHashTableSetAlphaBounds(PLDHashTable *table,
"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;
}
@ -323,7 +323,7 @@ PL_DHashTableSetAlphaBounds(PLDHashTable *table,
"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);