aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2018-08-21 18:50:16 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-21 18:50:22 +0200
commit489c17313090b58b5a4f898a47f23d50372923f2 (patch)
treef7881f1ba31fd00efe2fb4871192ae998ee49f7b /nx-X11/programs/Xserver
parent1e1693929eca32333885d76ddabbea965d14b45f (diff)
downloadnx-libs-489c17313090b58b5a4f898a47f23d50372923f2.tar.gz
nx-libs-489c17313090b58b5a4f898a47f23d50372923f2.tar.bz2
nx-libs-489c17313090b58b5a4f898a47f23d50372923f2.zip
Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xorg header].
Backport from X.org: commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c Author: Alan Coopersmith <Alan.Coopersmith@sun.com> Date: Tue May 2 01:30:37 2006 +0000 Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xorg header]. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/os/WaitFor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index 9133adff4..55fb997ea 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -769,7 +769,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,void * arg)
if (timeout < ScreenSaverTime)
{
return nextTimeout > 0 ?
- MIN(ScreenSaverTime - timeout, nextTimeout) :
+ min(ScreenSaverTime - timeout, nextTimeout) :
ScreenSaverTime - timeout;
}
@@ -779,7 +779,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,void * arg)
if (ScreenSaverInterval > 0)
{
nextTimeout = nextTimeout > 0 ?
- MIN(ScreenSaverInterval, nextTimeout) :
+ min(ScreenSaverInterval, nextTimeout) :
ScreenSaverInterval;
}
@@ -823,7 +823,7 @@ SetScreenSaverTimer(void)
if (ScreenSaverTime > 0)
{
timeout = timeout > 0 ?
- MIN(ScreenSaverTime, timeout) :
+ min(ScreenSaverTime, timeout) :
ScreenSaverTime;
}