diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-09-28 16:55:50 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2008-09-28 16:55:50 (GMT) |
| commit | 14def5e0c1c11cee1523e10c72df74f4cf5e451d (patch) | |
| tree | 7a263a5d7bc57842f18066c166be63c18bab97ca /backend/dvi/mdvi-lib/fontsrch.c | |
| parent | 5ecba587abf52861a6283db328a87d240cd751ce (diff) | |
Rename error as mdvi_error to avoid symbol conflicts with the libc error.
2008-09-28 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/dvi/mdvi-lib/common.h:
* backend/dvi/mdvi-lib/dviread.c:
* backend/dvi/mdvi-lib/font.c:
* backend/dvi/mdvi-lib/fontmap.c:
* backend/dvi/mdvi-lib/fontsrch.c:
* backend/dvi/mdvi-lib/gf.c:
* backend/dvi/mdvi-lib/pagesel.c:
* backend/dvi/mdvi-lib/pk.c:
* backend/dvi/mdvi-lib/sp-epsf.c:
* backend/dvi/mdvi-lib/special.c:
* backend/dvi/mdvi-lib/tfm.c:
* backend/dvi/mdvi-lib/tfmfile.c:
* backend/dvi/mdvi-lib/util.c:
* backend/dvi/mdvi-lib/vf.c:
Rename error as mdvi_error to avoid symbol conflicts with the libc
error. Rename also message, crash, fatal and warning for
consistency. Fixes bug #553369.
svn path=/trunk/; revision=3210
Diffstat (limited to 'backend/dvi/mdvi-lib/fontsrch.c')
| -rw-r--r-- | backend/dvi/mdvi-lib/fontsrch.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/dvi/mdvi-lib/fontsrch.c b/backend/dvi/mdvi-lib/fontsrch.c index 99d70ee..3f979da 100644 --- a/backend/dvi/mdvi-lib/fontsrch.c +++ b/backend/dvi/mdvi-lib/fontsrch.c @@ -255,8 +255,8 @@ again: } if(kid < MAX_CLASS - 1 && !STREQ(name, _mdvi_fallback_font)) { - warning("font `%s' at %dx%d not found, trying `%s' instead\n", - name, hdpi, vdpi, _mdvi_fallback_font); + mdvi_warning("font `%s' at %dx%d not found, trying `%s' instead\n", + name, hdpi, vdpi, _mdvi_fallback_font); name = _mdvi_fallback_font; kid = 0; goto again; @@ -275,8 +275,8 @@ again: } ptr = last->next; } else { - warning("font `%s' not found, trying metric files instead\n", - name); + mdvi_warning("font `%s' not found, trying metric files instead\n", + name); ptr = (DviFontClass *)font_classes[MAX_CLASS-1].head; } @@ -303,8 +303,8 @@ metrics: return filename; } if(!STREQ(name, _mdvi_fallback_font)) { - warning("metric file for `%s' not found, trying `%s' instead\n", - name, _mdvi_fallback_font); + mdvi_warning("metric file for `%s' not found, trying `%s' instead\n", + name, _mdvi_fallback_font); name = _mdvi_fallback_font; ptr = (DviFontClass *)font_classes[MAX_CLASS-1].head; goto metrics; |