mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 20:25:44 +00:00
Bug 437922 - use JS_MAX instead of the max() macro in prmjtime due to mingw-w64 bustage; r=mrbkap
This commit is contained in:
parent
53027c35dd
commit
4763c60ba6
@ -440,7 +440,7 @@ PRMJ_Now(void)
|
|||||||
|
|
||||||
/* On some dual processor/core systems, we might get an earlier time
|
/* On some dual processor/core systems, we might get an earlier time
|
||||||
so we cache the last time that we returned */
|
so we cache the last time that we returned */
|
||||||
calibration.last = max(calibration.last,(JSInt64)highresTime);
|
calibration.last = JS_MAX(calibration.last,(JSInt64)highresTime);
|
||||||
returnedTime = calibration.last;
|
returnedTime = calibration.last;
|
||||||
MUTEX_UNLOCK(&calibration.data_lock);
|
MUTEX_UNLOCK(&calibration.data_lock);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user