From c2e79cb408e118b45ca4566f806d7fb81bb28a4e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 29 Jan 2011 17:33:02 -0500 Subject: [PATCH] Fix macro definitions in last change to image.c --- src/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/image.c b/src/image.c index cc8589f924a..91b33c45507 100644 --- a/src/image.c +++ b/src/image.c @@ -5666,14 +5666,14 @@ init_png_functions (Lisp_Object libraries) #if (PNG_LIBPNG_VER < 10500) -#define PNG_LONGJMP(ptr) (longjmp (ptr->jmpbuf, 1)) +#define PNG_LONGJMP(ptr) (longjmp ((ptr)->jmpbuf, 1)) #define PNG_JMPBUF(ptr) ((ptr)->jmpbuf) #else /* In libpng version 1.5, the jmpbuf member is hidden. We need the extra cast for PNG_JMPBUF because, for Windows, DEF_IMGLIB_FN defines the return value of fn_png_set_longjmp_fn to be int (Bug#7908). */ -#define PNG_LONGJMP(ptr) (fn_png_longjmp (png_ptr, 1)) +#define PNG_LONGJMP(ptr) (fn_png_longjmp ((ptr), 1)) #define PNG_JMPBUF(ptr) \ (*(jmp_buf *)(fn_png_set_longjmp_fn((ptr), longjmp, sizeof (jmp_buf)))) #endif -- 2.39.5