aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-27 11:51:31 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 14:05:31 +0200
commitce40aec08aef6aebd1d25728a1d0dc4b2bc8db09 (patch)
tree35762983db2c3e9f0b2fec6501b77ec2d55a7fa4 /nx-X11/programs/Xserver/mi
parent74a5450bc058354e55c1589e64ef8e73775cebc4 (diff)
downloadnx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.tar.gz
nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.tar.bz2
nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.zip
nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead.
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r--nx-X11/programs/Xserver/mi/mibank.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mioverlay.c2
2 files changed, 3 insertions, 3 deletions
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;
}