Use min() [defined in include/misc.h] instead of MIN() [not defined in any
Xorg header].
This commit is contained in:
parent
ad124742ae
commit
724dbc2f8b
|
@ -1,3 +1,9 @@
|
|||
2006-05-01 Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* os/WaitFor.c:
|
||||
Use min() [defined in include/misc.h] instead of MIN() [not defined in
|
||||
any Xorg header].
|
||||
|
||||
2006-04-30 Adam Jackson <ajax@freedesktop.org>
|
||||
|
||||
* Xprint/pcl/PclGC.c:
|
||||
|
|
|
@ -641,7 +641,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
|
|||
if (timeout < ScreenSaverTime)
|
||||
{
|
||||
return nextTimeout > 0 ?
|
||||
MIN(ScreenSaverTime - timeout, nextTimeout) :
|
||||
min(ScreenSaverTime - timeout, nextTimeout) :
|
||||
ScreenSaverTime - timeout;
|
||||
}
|
||||
|
||||
|
@ -651,7 +651,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
|
|||
if (ScreenSaverInterval > 0)
|
||||
{
|
||||
nextTimeout = nextTimeout > 0 ?
|
||||
MIN(ScreenSaverInterval, nextTimeout) :
|
||||
min(ScreenSaverInterval, nextTimeout) :
|
||||
ScreenSaverInterval;
|
||||
}
|
||||
|
||||
|
@ -695,7 +695,7 @@ SetScreenSaverTimer(void)
|
|||
if (ScreenSaverTime > 0)
|
||||
{
|
||||
timeout = timeout > 0 ?
|
||||
MIN(ScreenSaverTime, timeout) :
|
||||
min(ScreenSaverTime, timeout) :
|
||||
ScreenSaverTime;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user