diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-26 01:51:18 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:05:30 +0200 |
| commit | 2646fc254e75c4a7fc10d03d1139d0bd708ceae9 (patch) | |
| tree | 6a183ec2959f55cf8d6850d072b557399b401f7e /nx-X11/programs/Xserver/dix/cursor.c | |
| parent | acf87144d019f18e646501657d9082c6eba77f54 (diff) | |
| download | nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.tar.gz nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.tar.bz2 nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.zip | |
nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc() instead.
Diffstat (limited to 'nx-X11/programs/Xserver/dix/cursor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/cursor.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c index 575ff1eb4..875e19480 100644 --- a/nx-X11/programs/Xserver/dix/cursor.c +++ b/nx-X11/programs/Xserver/dix/cursor.c @@ -174,7 +174,7 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, int nscr; ScreenPtr pscr; - pCurs = (CursorPtr)xalloc(sizeof(CursorRec) + sizeof(CursorBits)); + pCurs = (CursorPtr)malloc(sizeof(CursorRec) + sizeof(CursorBits)); if (!pCurs) { free(psrcbits); @@ -292,7 +292,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, } if (pShare) { - pCurs = (CursorPtr)xalloc(sizeof(CursorRec)); + pCurs = (CursorPtr)malloc(sizeof(CursorRec)); if (!pCurs) return BadAlloc; bits = pShare->bits; @@ -311,7 +311,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, register unsigned char *mskptr; n = BitmapBytePad(cm.width)*(long)cm.height; - mskptr = mskbits = (unsigned char *)xalloc(n); + mskptr = mskbits = (unsigned char *)malloc(n); if (!mskptr) return BadAlloc; while (--n >= 0) @@ -334,7 +334,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, } if (sourcefont != maskfont) { - pCurs = (CursorPtr)xalloc(sizeof(CursorRec) + sizeof(CursorBits)); + pCurs = (CursorPtr)malloc(sizeof(CursorRec) + sizeof(CursorBits)); if (pCurs) bits = (CursorBitsPtr)((char *)pCurs + sizeof(CursorRec)); else @@ -342,9 +342,9 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, } else { - pCurs = (CursorPtr)xalloc(sizeof(CursorRec)); + pCurs = (CursorPtr)malloc(sizeof(CursorRec)); if (pCurs) - bits = (CursorBitsPtr)xalloc(sizeof(CursorBits)); + bits = (CursorBitsPtr)malloc(sizeof(CursorBits)); else bits = (CursorBitsPtr)NULL; } @@ -369,7 +369,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, else { bits->refcnt = 1; - pShare = (GlyphSharePtr)xalloc(sizeof(GlyphShare)); + pShare = (GlyphSharePtr)malloc(sizeof(GlyphShare)); if (!pShare) { FreeCursorBits(bits); |