summaryrefslogtreecommitdiff
path: root/xserver/exa/exa_offscreen.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-05 15:36:12 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-05 15:36:12 +0000
commita90ee792d96752ad1b71b9ada922fa6afe478c99 (patch)
tree6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/exa/exa_offscreen.c
parentbc97d4ecc0aa9e1b823565b07282f848700bd11a (diff)
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/exa/exa_offscreen.c')
-rw-r--r--xserver/exa/exa_offscreen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xserver/exa/exa_offscreen.c b/xserver/exa/exa_offscreen.c
index e3a9ab2f6..5abe3b891 100644
--- a/xserver/exa/exa_offscreen.c
+++ b/xserver/exa/exa_offscreen.c
@@ -245,7 +245,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
/* save extra space in new area */
if (real_size < area->size)
{
- ExaOffscreenArea *new_area = xalloc (sizeof (ExaOffscreenArea));
+ ExaOffscreenArea *new_area = malloc(sizeof (ExaOffscreenArea));
if (!new_area)
return NULL;
new_area->base_offset = area->base_offset;
@@ -408,7 +408,7 @@ ExaOffscreenMerge (ExaScreenPrivPtr pExaScr, ExaOffscreenArea *area)
area->next->prev = area;
else
pExaScr->info->offScreenAreas->prev = area;
- xfree (next);
+ free(next);
pExaScr->numOffscreenAvailable--;
}
@@ -655,7 +655,7 @@ exaOffscreenInit (ScreenPtr pScreen)
ExaOffscreenArea *area;
/* Allocate a big free area */
- area = xalloc (sizeof (ExaOffscreenArea));
+ area = malloc(sizeof (ExaOffscreenArea));
if (!area)
return FALSE;
@@ -691,6 +691,6 @@ ExaOffscreenFini (ScreenPtr pScreen)
while ((area = pExaScr->info->offScreenAreas))
{
pExaScr->info->offScreenAreas = area->next;
- xfree (area);
+ free(area);
}
}