diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
| commit | 015d728bcde5b16a72a976579755421e3023626b (patch) | |
| tree | a77516504f14c8b20f844727f1cb2d4dcb87e757 /dix/cursor.c | |
| parent | 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070 (diff) | |
| parent | b167583fe234a536aa6187e17f21da85be4f0b7f (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
Diffstat (limited to 'dix/cursor.c')
| -rw-r--r-- | dix/cursor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dix/cursor.c b/dix/cursor.c index e44a5efb0..5b5c498b0 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -87,7 +87,7 @@ FreeCursorBits(CursorBitsPtr bits) #endif if (bits->refcnt == 0) { - register GlyphSharePtr *prev, this; + GlyphSharePtr *prev, this; for (prev = &sharedGlyphs; (this = *prev) && (this->bits != bits); @@ -142,7 +142,7 @@ FreeCursor(pointer value, XID cid) static void CheckForEmptyMask(CursorBitsPtr bits) { - register unsigned char *msk = bits->mask; + unsigned char *msk = bits->mask; int n = BitmapBytePad(bits->width) * bits->height; bits->emptyMask = FALSE; @@ -341,8 +341,8 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, } if (!maskfont) { - register long n; - register unsigned char *mskptr; + long n; + unsigned char *mskptr; n = BitmapBytePad(cm.width)*(long)cm.height; mskptr = mskbits = (unsigned char *)xalloc(n); |