[PATCH] Replace xalloc with malloc
Tomas Carnecky
tom at dbservice.com
Wed Jun 16 12:19:11 PDT 2010
Same for xfree/xrealloc/xcalloc. Also, yay for Xcalloc() taking only
one argument.
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
---
XKBsrv.h | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/XKBsrv.h b/XKBsrv.h
index 26a4ed8..4ab7587 100644
--- a/XKBsrv.h
+++ b/XKBsrv.h
@@ -294,15 +294,15 @@ extern pointer XkbLastRepeatEvent;
extern CARD32 xkbDebugFlags;
extern CARD32 xkbDebugCtrls;
-#define _XkbAlloc(s) xalloc((s))
-#define _XkbCalloc(n,s) Xcalloc((n)*(s))
-#define _XkbRealloc(o,s) Xrealloc((o),(s))
-#define _XkbTypedAlloc(t) ((t *)xalloc(sizeof(t)))
-#define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n)*sizeof(t)))
+#define _XkbAlloc(s) malloc((s))
+#define _XkbCalloc(n,s) calloc((n),(s))
+#define _XkbRealloc(o,s) realloc((o),(s))
+#define _XkbTypedAlloc(t) ((t *)malloc(sizeof(t)))
+#define _XkbTypedCalloc(n,t) ((t *)calloc((n),sizeof(t)))
#define _XkbTypedRealloc(o,n,t) \
- ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
+ ((o)?(t *)realloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
-#define _XkbFree(p) Xfree(p)
+#define _XkbFree(p) free(p)
#define _XkbLibError(c,l,d) \
{ _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
--
1.7.1.252.g2c7d
More information about the xorg-devel
mailing list