diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /randr/rrcrtc.c | |
parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'randr/rrcrtc.c')
-rw-r--r-- | randr/rrcrtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index a40298f7d..7c22437a9 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -73,7 +73,7 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate) return FALSE; pScrPriv->crtcs = crtcs; - crtc = xalloc (sizeof (RRCrtcRec)); + crtc = xcalloc (1, sizeof (RRCrtcRec)); if (!crtc) return NULL; crtc->id = FakeClientID (0); |