frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2006-04-30 Adam Jackson <ajax@freedesktop.org>
* Xprint/pcl/PclGC.c: * Xprint/pcl/PclGC.c:

6
os/WaitFor.c
View File

@ -641,7 +641,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
if (timeout < ScreenSaverTime) if (timeout < ScreenSaverTime)
{ {
return nextTimeout > 0 ? return nextTimeout > 0 ?
MIN(ScreenSaverTime - timeout, nextTimeout) : min(ScreenSaverTime - timeout, nextTimeout) :
ScreenSaverTime - timeout; ScreenSaverTime - timeout;
} }
@ -651,7 +651,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
if (ScreenSaverInterval > 0) if (ScreenSaverInterval > 0)
{ {
nextTimeout = nextTimeout > 0 ? nextTimeout = nextTimeout > 0 ?
MIN(ScreenSaverInterval, nextTimeout) : min(ScreenSaverInterval, nextTimeout) :
ScreenSaverInterval; ScreenSaverInterval;
} }
@ -695,7 +695,7 @@ SetScreenSaverTimer(void)
if (ScreenSaverTime > 0) if (ScreenSaverTime > 0)
{ {
timeout = timeout > 0 ? timeout = timeout > 0 ?
MIN(ScreenSaverTime, timeout) : min(ScreenSaverTime, timeout) :
ScreenSaverTime; ScreenSaverTime;
} }