diff options
| author | Tor Andersson <tor@ghostscript.com> | 2009-04-08 11:50:30 +0200 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2009-04-08 11:50:30 +0200 |
| commit | 7a1c8d86f519c789d0f743754f7f0734bf338306 (patch) | |
| tree | d783bc9ac3b411cd9bd52bb68fafec10bf5d98de | |
| parent | c9b9f61d311aa7238e288dc751832b396e17e6bc (diff) | |
| download | mupdf-7a1c8d86f519c789d0f743754f7f0734bf338306.tar.xz | |
Various MSVC fixes.
| -rw-r--r-- | fitz/fitz_base.h | 6 | ||||
| -rw-r--r-- | fitz/res_font.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h index 23198665..be1732b9 100644 --- a/fitz/fitz_base.h +++ b/fitz/fitz_base.h @@ -54,7 +54,7 @@ extern int opterr, optind, optopt; extern char *optarg; #endif -#ifdef MSVC /* stupid stone-age compiler */ +#ifdef _MSC_VER /* stupid stone-age compiler */ #include <io.h> @@ -63,11 +63,7 @@ extern int gettimeofday(struct timeval *tv, struct timezone *tz); #define FZ_FLEX 1 #define restrict -#ifdef _MSC_VER #define inline __inline -#else -#define inline __inline__ -#endif #define __func__ __FUNCTION__ diff --git a/fitz/res_font.c b/fitz/res_font.c index 884de8ff..7068096d 100644 --- a/fitz/res_font.c +++ b/fitz/res_font.c @@ -326,6 +326,9 @@ fz_newtype3font(fz_font **fontp, char *name, fz_matrix matrix) return fz_okay; } +/* XXX UGLY HACK XXX */ +extern fz_colorspace *pdf_devicegray; + fz_error fz_rendert3glyph(fz_glyph *glyph, fz_font *font, int gid, fz_matrix trm) { @@ -354,9 +357,6 @@ fz_rendert3glyph(fz_glyph *glyph, fz_font *font, int gid, fz_matrix trm) return fz_okay; } - /* XXX UGLY HACK XXX */ - extern fz_colorspace *pdf_devicegray; - ctm = fz_concat(font->t3matrix, trm); bbox = fz_roundrect(fz_boundtree(tree, ctm)); |