diff options
author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-06-23 21:05:32 (GMT) |
---|---|---|
committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-06-23 21:05:32 (GMT) |
commit | a8e6dab2d1f20a861df947c5705b6bbd0cb81c1a (patch) | |
tree | cdea106e2e1798cba68d4e492e724b832ab6411d /dvi/mdvi-lib/common.h | |
parent | 1f82fa9589a57a49476066010861a0dae84f39a1 (diff) |
Rename xmalloc to mdvi_malloc to avoid libtool conflict, update year in
copyright.
Diffstat (limited to 'dvi/mdvi-lib/common.h')
-rw-r--r-- | dvi/mdvi-lib/common.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dvi/mdvi-lib/common.h b/dvi/mdvi-lib/common.h index e9c007e..fe4d6f7 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)); |