From ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Jun 2016 11:51:31 +0200 Subject: nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead. --- nx-X11/programs/Xserver/mi/mibank.c | 4 ++-- nx-X11/programs/Xserver/mi/mioverlay.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/mi') diff --git a/nx-X11/programs/Xserver/mi/mibank.c b/nx-X11/programs/Xserver/mi/mibank.c index 754b0916f..a651c021e 100644 --- a/nx-X11/programs/Xserver/mi/mibank.c +++ b/nx-X11/programs/Xserver/mi/mibank.c @@ -2243,11 +2243,11 @@ miInitializeBanking( (sizeof(miBankGCRec) - sizeof(RegionPtr)))) return FALSE; - if (!(pScreenPriv = (miBankScreenPtr)Xcalloc(sizeof(miBankScreenRec)))) + if (!(pScreenPriv = (miBankScreenPtr)calloc(1, sizeof(miBankScreenRec)))) return FALSE; if (!(pScreenPriv->pBanks = /* Allocate and clear */ - (RegionPtr *)Xcalloc(nBanks * sizeof(RegionPtr)))) + (RegionPtr *)calloc(1, nBanks * sizeof(RegionPtr)))) { free(pScreenPriv); return FALSE; diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index cff29ee2a..3a85863ed 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -196,7 +196,7 @@ miOverlayCreateWindow(WindowPtr pWin) pWinPriv->tree = NULL; if(!pWin->parent || !((*pScreenPriv->InOverlay)(pWin))) { - if(!(pTree = (miOverlayTreePtr)xcalloc(1, sizeof(miOverlayTreeRec)))) + if(!(pTree = (miOverlayTreePtr)calloc(1, sizeof(miOverlayTreeRec)))) return FALSE; } -- cgit v1.2.3