summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-01-29 17:33:02 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-01-29 17:33:02 -0500
commit282cf4cfd5df1e7cf6ef9b3647be5aaa0edebd4a (patch)
tree1f4a7d9b9b47e00848b8296d35e2df59b05a2a38
parent506bd8110ada0dc0bf3068d157641de793236af7 (diff)
downloademacs-282cf4cfd5df1e7cf6ef9b3647be5aaa0edebd4a.tar.gz
Fix macro definitions in last change to image.c
-rw-r--r--src/image.c4
1 files 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