diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 10:55:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 10:55:02 +0200 |
| commit | fad80bc4fda7edec2b6a7c19dcd1a03600646fec (patch) | |
| tree | 995443565bb0c12bb06ff2bde8982ae8e4caa145 /nx-X11/programs/Xserver/hw/nxagent/Drawable.c | |
| parent | b517b66efcbb30bb7f7add4fb5bfe48f3185b615 (diff) | |
| parent | 3bd41aaf7f882cb1df4ab62a064920b797c5b41d (diff) | |
| download | nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.tar.gz nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.tar.bz2 nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.zip | |
Merge branch 'uli42-pr/drop_double_min_max' into 3.6.x
Attributes GH PR #724: https://github.com/ArcticaProject/nx-libs/pull/724
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Drawable.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 5 |
1 files changed, 3 insertions, 2 deletions
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. |