X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=dvi%2Fmdvi-lib%2Fcommon.h;h=fe4d6f7084f88db0095633d12f9c9afa9cc09efb;hb=65c06150e05948eb7b056b0ec5cb9c364b652cfe;hp=e9c007ed7afbd261734a5ddc929aa26ac21fc6e1;hpb=e88d645e01f3bfbdbeb965f49a091887ead04ab1;p=evince.git

diff --git a/dvi/mdvi-lib/common.h b/dvi/mdvi-lib/common.h
index e9c007ed..fe4d6f70 100644
--- a/dvi/mdvi-lib/common.h
+++ b/dvi/mdvi-lib/common.h
@@ -202,19 +202,19 @@ extern void __debug __PROTO((int, const char *, ...));
 
 /* memory allocation */
 
-extern void  xfree __PROTO((void *));
-extern void *xmalloc __PROTO((size_t));
-extern void *xrealloc __PROTO((void *, size_t));
-extern void *xcalloc __PROTO((size_t, size_t));
-extern char *xstrncpy __PROTO((char *, const char *, size_t));
-extern char *xstrdup __PROTO((const char *));
-extern char *xstrndup __PROTO((const char *, size_t));
-extern void *xmemdup __PROTO((const void *, size_t));
+extern void  mdvi_free __PROTO((void *));
+extern void *mdvi_malloc __PROTO((size_t));
+extern void *mdvi_realloc __PROTO((void *, size_t));
+extern void *mdvi_calloc __PROTO((size_t, size_t));
+extern char *mdvi_strncpy __PROTO((char *, const char *, size_t));
+extern char *mdvi_strdup __PROTO((const char *));
+extern char *mdvi_strndup __PROTO((const char *, size_t));
+extern void *mdvi_memdup __PROTO((const void *, size_t));
 
 /* macros to make memory allocation nicer */
-#define xalloc(t)	(t *)xmalloc(sizeof(t))
-#define xnalloc(t,n)	(t *)xcalloc((n), sizeof(t))
-#define xresize(p,t,n)	(t *)xrealloc((p), (n) * sizeof(t))
+#define xalloc(t)	(t *)mdvi_malloc(sizeof(t))
+#define xnalloc(t,n)	(t *)mdvi_calloc((n), sizeof(t))
+#define xresize(p,t,n)	(t *)mdvi_realloc((p), (n) * sizeof(t))
 
 extern char *xstradd __PROTO((char *, size_t *, size_t, const char *, size_t));