diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-08 14:03:34 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-08 14:03:34 +0100 |
| commit | 274ab2d66943bb891976ef712a816e7d128eff22 (patch) | |
| tree | bee912b4426f3dfe4acc176a57fd5b55db58d53c /fitz/fitz.h | |
| parent | 51661f29a5f229f30ae16e16bd0ef6396cd001af (diff) | |
| parent | 511ea75a53db6e72334438bcda2ce774c7d72d1e (diff) | |
| download | mupdf-274ab2d66943bb891976ef712a816e7d128eff22.tar.xz | |
Merge branch 'master' into forms
Conflicts:
Makefile
apps/mudraw.c
pdf/pdf_write.c
win32/libmupdf-v8.vcproj
Diffstat (limited to 'fitz/fitz.h')
| -rw-r--r-- | fitz/fitz.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fitz/fitz.h b/fitz/fitz.h index a04ef584..8bbc2ec4 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -237,8 +237,8 @@ void fz_var_imp(void *); */ #define fz_try(ctx) \ - if (fz_push_try(ctx->error), \ - (ctx->error->stack[ctx->error->top].code = fz_setjmp(ctx->error->stack[ctx->error->top].buffer)) == 0) \ + if (fz_push_try(ctx->error) && \ + ((ctx->error->stack[ctx->error->top].code = fz_setjmp(ctx->error->stack[ctx->error->top].buffer)) == 0))\ { do { #define fz_always(ctx) \ @@ -251,7 +251,7 @@ void fz_var_imp(void *); } \ if (ctx->error->stack[ctx->error->top--].code) -void fz_push_try(fz_error_context *ex); +int fz_push_try(fz_error_context *ex); void fz_throw(fz_context *, char *, ...) __printflike(2, 3); void fz_rethrow(fz_context *); void fz_warn(fz_context *ctx, char *fmt, ...) __printflike(2, 3); |