From 7edeed5a4fae0199a65dc724c2c131d4d120bf28 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 5 Oct 2004 11:05:26 +0200 Subject: strip out c99-isms for msvc --- include/fitz/base.h | 6 ++++++ include/fitz/geometry.h | 2 +- include/fitz/sysdep.h | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/fitz/base.h b/include/fitz/base.h index 36fe0aeb..c255efe9 100644 --- a/include/fitz/base.h +++ b/include/fitz/base.h @@ -35,8 +35,14 @@ struct fz_error_s #define fz_outofmem (&fz_koutofmem) extern fz_error fz_koutofmem; +#ifdef __WIN32__ +#define fz_throw fz_throwMS +fz_error *fz_throwMS(char *fmt, ...); +#else #define fz_throw(fmt, ...) fz_throw0(__func__, __FILE__, __LINE__, fmt, ## __VA_ARGS__) fz_error *fz_throw0(const char *func, const char *file, int line, char *fmt, ...); +#endif + void fz_warn(char *fmt, ...); void fz_abort(fz_error *eo); void fz_freeerror(fz_error *eo); diff --git a/include/fitz/geometry.h b/include/fitz/geometry.h index 588aa562..29a6b522 100644 --- a/include/fitz/geometry.h +++ b/include/fitz/geometry.h @@ -36,7 +36,7 @@ struct fz_irect_s fz_ipoint max; }; -#define FZ_INFRECT (fz_rect){{1,1},{-1,-1}} +fz_rect fz_infiniterect(void); fz_matrix fz_concat(fz_matrix one, fz_matrix two); fz_matrix fz_identity(void); diff --git a/include/fitz/sysdep.h b/include/fitz/sysdep.h index bb78521f..39221272 100644 --- a/include/fitz/sysdep.h +++ b/include/fitz/sysdep.h @@ -31,6 +31,12 @@ typedef signed long long fz_s64; * Extras! Extras! Get them while they're hot! */ +#ifdef __WIN32__ +#define NEED_STRLCPY +#define NEED_STRSEP +#define NEED_GETOPT +#endif + #ifdef NEED_STRLCPY extern int strlcpy(char *dst, const char *src, int n); extern int strlcat(char *dst, const char *src, int n); -- cgit v1.2.3