summaryrefslogtreecommitdiff
path: root/os/WaitFor.c
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-05-02 01:30:37 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-05-02 01:30:37 +0000
commit724dbc2f8bbe2f21bf16f20ca7b8bb555516626c (patch)
treed9ca5d6d3e7700b98a310aec847d7610452eb609 /os/WaitFor.c
parentad124742ae2a265a54a4a7ac91709ec6fd6ced34 (diff)
Use min() [defined in include/misc.h] instead of MIN() [not defined in any
Xorg header].
Diffstat (limited to 'os/WaitFor.c')
-rw-r--r--os/WaitFor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c
index a4f0f4c78..f132e0e9a 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.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;
}