[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100434: Fix macro definitions in last change to image.c

[Chong Yidong]

------------------------------------------------------------
revno: 100434
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-01-29 17:33:02 -0500
message:
  Fix macro definitions in last change to image.c
modified:
  src/image.c

=== modified file 'src/image.c'
--- a/src/image.c       2011-01-29 21:28:26 +0000
+++ b/src/image.c       2011-01-29 22:33:02 +0000
@@ -5666,14 +5666,14 @@
 
 
 #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