diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-05 19:08:36 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-05 19:08:36 -0500 |
| commit | a52c9b2a59f27266557ff9d5d2c08492e04135a6 (patch) | |
| tree | 705f11c54e8a31a07dde9ab6835032e2849e132b /Xext/saver.c | |
| parent | c7e18beb3c87eb1ada9b21c4ffacd11c1939c087 (diff) | |
| parent | 58332894c061ae96d6a457f65266660f5f65e88b (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
Diffstat (limited to 'Xext/saver.c')
| -rw-r--r-- | Xext/saver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xext/saver.c b/Xext/saver.c index eff932573..6905fc678 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -687,7 +687,7 @@ CreateSaverWindow (pScreen) wantMap = wColormap (pWin); if (wantMap == None) return TRUE; - installedMaps = (Colormap *) ALLOCATE_LOCAL (pScreen->maxInstalledCmaps * + installedMaps = (Colormap *) xalloc (pScreen->maxInstalledCmaps * sizeof (Colormap)); numInstalled = (*pWin->drawable.pScreen->ListInstalledColormaps) (pScreen, installedMaps); @@ -695,7 +695,7 @@ CreateSaverWindow (pScreen) if (installedMaps[i] == wantMap) break; - DEALLOCATE_LOCAL ((char *) installedMaps); + xfree ((char *) installedMaps); if (i < numInstalled) return TRUE; |