From 3bd41aaf7f882cb1df4ab62a064920b797c5b41d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 23 Aug 2018 22:57:27 +0200 Subject: Replace MIN/MAX macros by min/max from misc.h We do not need two versions in the code --- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Drawable.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 522870546..88f3da3a9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -25,6 +25,7 @@ #include "dixstruct.h" #include "../../fb/fb.h" +#include "misc.h" #include "Agent.h" #include "Display.h" @@ -696,11 +697,11 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned for (y = box.y1; y < box.y2; y += h) { - h = MIN(box.y2 - y, tileHeight); + h = min(box.y2 - y, tileHeight); for (x = box.x1; x < box.x2; x += w) { - w = MIN(box.x2 - x, tileWidth); + w = min(box.x2 - x, tileWidth); /* * FIXME: This should not occur. -- cgit v1.2.3