From 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 2 May 2006 01:30:37 +0000 Subject: [PATCH] Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xorg header]. --- ChangeLog | 6 ++++++ os/WaitFor.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 316cde742..cbe4c0457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-01 Alan Coopersmith + + * os/WaitFor.c: + Use min() [defined in include/misc.h] instead of MIN() [not defined in + any Xorg header]. + 2006-04-30 Adam Jackson * Xprint/pcl/PclGC.c: 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; }