diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-06-03 13:37:32 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-06-03 13:45:42 -0400 |
| commit | e1e8c7ddd7fdbfd674361364295fb1cbd5f28b45 (patch) | |
| tree | 52945278e94746acfb4c01fd5f81b0af19aaa5ea /hw/xwin | |
| parent | 7f027d9dc0146e229802aeac342ea2dbab63264a (diff) | |
s/MIN/min/, s/MAX/max/ (#2968)
Diffstat (limited to 'hw/xwin')
| -rw-r--r-- | hw/xwin/wincursor.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index fcd156e50..952560844 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -39,14 +39,10 @@ #include <cursorstr.h> #include <mipointrst.h> #include <servermd.h> +#include "misc.h" extern Bool g_fSoftwareCursor; - -#ifndef MIN -#define MIN(x,y) ((x)<(y)?(x):(y)) -#endif - #define BYTE_COUNT(x) (((x) + 7) / 8) #define BRIGHTNESS(x) (x##Red * 0.299 + x##Green * 0.587 + x##Blue * 0.114) @@ -198,8 +194,8 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen) nBytes = BYTE_COUNT(pScreenPriv->cursor.sm_cx) * pScreenPriv->cursor.sm_cy; /* Get the effective width and height */ - nCX = MIN(pScreenPriv->cursor.sm_cx, pCursor->bits->width); - nCY = MIN(pScreenPriv->cursor.sm_cy, pCursor->bits->height); + nCX = min(pScreenPriv->cursor.sm_cx, pCursor->bits->width); + nCY = min(pScreenPriv->cursor.sm_cy, pCursor->bits->height); /* Allocate memory for the bitmaps */ pAnd = malloc (nBytes); |