From 489c17313090b58b5a4f898a47f23d50372923f2 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue, 21 Aug 2018 18:50:16 +0200
Subject: 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>
---
nx-X11/programs/Xserver/os/WaitFor.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'nx-X11/programs/Xserver/os')
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;
}
--
cgit v1.2.3