From 3f3ff971ecff9936cebafc813af9193b97bba89c Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Thu, 6 May 2010 01:44:06 +0700 Subject: Replace X-allocation functions with their C89 counterparts The only remaining X-functions used in server are XNF*, the rest is converted to plain alloc/calloc/realloc/free/strdup. X* functions are still exported from server and x* macros are still defined in header file, so both ABI and API are not affected by this change. Signed-off-by: Mikhail Gusarov Reviewed-by: Peter Hutterer --- include/regionstr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/regionstr.h b/include/regionstr.h index eead1a1f2..6a5c98c80 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -142,7 +142,7 @@ extern _X_EXPORT RegDataRec miBrokenData; { \ (_pReg)->extents = miEmptyBox; \ if (((_size) > 1) && ((_pReg)->data = \ - (RegDataPtr)xalloc(REGION_SZOF(_size)))) \ + (RegDataPtr)malloc(REGION_SZOF(_size)))) \ { \ (_pReg)->data->size = (_size); \ (_pReg)->data->numRects = 0; \ @@ -156,7 +156,7 @@ extern _X_EXPORT RegDataRec miBrokenData; #define REGION_UNINIT(_pScreen, _pReg) \ { \ if ((_pReg)->data && (_pReg)->data->size) { \ - xfree((_pReg)->data); \ + free((_pReg)->data); \ (_pReg)->data = NULL; \ } \ } -- cgit v1.2.3