diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/miext/rootless/rootlessCommon.c | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/miext/rootless/rootlessCommon.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessCommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/miext/rootless/rootlessCommon.c b/xorg-server/miext/rootless/rootlessCommon.c index 97c92d309..e3dd9d97c 100644 --- a/xorg-server/miext/rootless/rootlessCommon.c +++ b/xorg-server/miext/rootless/rootlessCommon.c @@ -109,8 +109,8 @@ RootlessResolveColormap (ScreenPtr pScreen, int first_color, map = RootlessGetColormap (pScreen); if (map == NULL || map->class != PseudoColor) return FALSE; - last = MIN (map->pVisual->ColormapEntries, first_color + n_colors); - for (i = MAX (0, first_color); i < last; i++) { + last = min (map->pVisual->ColormapEntries, first_color + n_colors); + for (i = max (0, first_color); i < last; i++) { Entry *ent = map->red + i; uint16_t red, green, blue; |