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/fb/fbpseudocolor.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/fb/fbpseudocolor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/fb/fbpseudocolor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c index bc1c091ed..71f39b52f 100644 --- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c +++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c @@ -271,7 +271,7 @@ xxCreateScreenResources(ScreenPtr pScreen) if (pScrPriv->addr) pBits = pScrPriv->addr; else - pBits = xalloc(pScreen->width * pScreen->height + pBits = malloc(pScreen->width * pScreen->height * (BitsPerPixel(depth) >> 3)); if (!pBits) return FALSE; @@ -370,11 +370,11 @@ xxInitColormapPrivate(ColormapPtr pmap) if (xxMyVisual(pmap->pScreen,pmap->pVisual->vid)) { DBG("CreateColormap\n"); - pCmapPriv = (xxCmapPrivPtr) xalloc (sizeof (xxCmapPrivRec)); + pCmapPriv = (xxCmapPrivPtr) malloc (sizeof (xxCmapPrivRec)); if (!pCmapPriv) return FALSE; pmap->devPrivates[xxColormapPrivateIndex].ptr = (void *) pCmapPriv; - cmap = xalloc(sizeof (CARD32) * (1 << pScrPriv->myDepth)); + cmap = malloc(sizeof (CARD32) * (1 << pScrPriv->myDepth)); if (!cmap) return FALSE; @@ -1109,7 +1109,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy if (!AllocateGCPrivate (pScreen, xxGCPrivateIndex, sizeof (xxGCPrivRec))) return FALSE; - pScrPriv = (xxScrPrivPtr) xalloc (sizeof (xxScrPrivRec)); + pScrPriv = (xxScrPrivPtr) malloc (sizeof (xxScrPrivRec)); if (!pScrPriv) return FALSE; |