Rename xmalloc to mdvi_malloc to avoid libtool conflict, update year in

[evince.git] / dvi / mdvi-lib / font.c

diff --git a/dvi/mdvi-lib/font.c b/dvi/mdvi-lib/font.c
index 265b081e33006a61cea34761e5f4449a88e33cb9..ca3436c5ee8f368aab1cc819100beb6af0c29269 100644 (file)
--- a/dvi/mdvi-lib/font.c
+++ b/dvi/mdvi-lib/font.c
@@ -74,7 +74,7 @@ void  font_drop_one(DviFontRef *ref)
        DviFont *font;
        
        font = ref->ref;
-       xfree(ref);
+       mdvi_free(ref);
        /* drop all children */
        for(ref = font->subfonts; ref; ref = ref->next) {
                /* just adjust the reference counts */
@@ -131,7 +131,7 @@ int font_free_unused(DviDevice *dev)
                /* get rid of subfonts (but can't use `drop_chain' here) */
                for(; (ref = font->subfonts); ) {
                        font->subfonts = ref->next;
-                       xfree(ref);
+                       mdvi_free(ref);
                }
                /* remove this font */
                font_reset_font_glyphs(dev, font, MDVI_FONTSEL_GLYPH);
@@ -140,10 +140,10 @@ int       font_free_unused(DviDevice *dev)
                        font->finfo->freedata(font);
                /* destroy characters */
                if(font->chars)
-                       xfree(font->chars);
-               xfree(font->fontname);
-               xfree(font->filename);
-               xfree(font);
+                       mdvi_free(font->chars);
+               mdvi_free(font->fontname);
+               mdvi_free(font->filename);
+               mdvi_free(font);
        }
        DEBUG((DBG_FONTS, "%d unused fonts removed\n", count));
        return count;