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/common.h | |
| 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/common.h')
| -rw-r--r-- | backend/dvi/mdvi-lib/common.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/backend/dvi/mdvi-lib/common.h b/backend/dvi/mdvi-lib/common.h index 2da61c8..c5a908e 100644 --- a/backend/dvi/mdvi-lib/common.h +++ b/backend/dvi/mdvi-lib/common.h @@ -136,11 +136,11 @@ extern char *read_alloc_bcpl __PROTO((FILE *, size_t, size_t *)); /* miscellaneous */ -extern void message __PROTO((const char *, ...)); -extern void crash __PROTO((const char *, ...)); -extern void fatal __PROTO((const char *, ...)); -extern void error __PROTO((const char *, ...)); -extern void warning __PROTO((const char *, ...)); +extern void mdvi_message __PROTO((const char *, ...)); +extern void mdvi_crash __PROTO((const char *, ...)); +extern void mdvi_fatal __PROTO((const char *, ...)); +extern void mdvi_error __PROTO((const char *, ...)); +extern void mdvi_warning __PROTO((const char *, ...)); extern int unit2pix __PROTO((int, const char *)); extern double unit2pix_factor __PROTO((const char *)); @@ -182,12 +182,12 @@ extern Uint32 _mdvi_debug_mask; extern void __debug __PROTO((int, const char *, ...)); #define DEBUG(x) __debug x #define ASSERT(x) do { \ - if(!(x)) crash("%s:%d: Assertion %s failed\n", \ + if(!(x)) mdvi_crash("%s:%d: Assertion %s failed\n", \ __FILE__, __LINE__, #x); \ } while(0) #define ASSERT_VALUE(x,y) do { \ if((x) != (y)) \ - crash("%s:%d: Assertion failed (%d = %s != %s)\n", \ + mdvi_crash("%s:%d: Assertion failed (%d = %s != %s)\n", \ __FILE__, __LINE__, (x), #x, #x); \ } while(0) #else |