SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use min() [defined in include/misc.h] instead of MIN() [not defined in any

Browse Source 
Xorg header].
This commit is contained in:
Alan Coopersmith
2006-05-02 01:30:37 +00:00
parent ad124742ae
commit 724dbc2f8b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os/WaitFor.c
View File

@@ -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;
}