aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-01-29 17:33:02 -0500
committerChong Yidong2011-01-29 17:33:02 -0500
commitc2e79cb408e118b45ca4566f806d7fb81bb28a4e (patch)
treea40049cec5e2ce6a882d4ad07b8807acf0eb416d /src
parent82d84d3fc97ed20079b42bb2b2c319437a299ad9 (diff)
downloademacs-c2e79cb408e118b45ca4566f806d7fb81bb28a4e.tar.gz
emacs-c2e79cb408e118b45ca4566f806d7fb81bb28a4e.zip
Fix macro definitions in last change to image.c
Diffstat (limited to 'src')
-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)
5666 5666
5667 5667
5668#if (PNG_LIBPNG_VER < 10500) 5668#if (PNG_LIBPNG_VER < 10500)
5669#define PNG_LONGJMP(ptr) (longjmp (ptr->jmpbuf, 1)) 5669#define PNG_LONGJMP(ptr) (longjmp ((ptr)->jmpbuf, 1))
5670#define PNG_JMPBUF(ptr) ((ptr)->jmpbuf) 5670#define PNG_JMPBUF(ptr) ((ptr)->jmpbuf)
5671#else 5671#else
5672/* In libpng version 1.5, the jmpbuf member is hidden. 5672/* In libpng version 1.5, the jmpbuf member is hidden.
5673 We need the extra cast for PNG_JMPBUF because, for Windows, 5673 We need the extra cast for PNG_JMPBUF because, for Windows,
5674 DEF_IMGLIB_FN defines the return value of fn_png_set_longjmp_fn to 5674 DEF_IMGLIB_FN defines the return value of fn_png_set_longjmp_fn to
5675 be int (Bug#7908). */ 5675 be int (Bug#7908). */
5676#define PNG_LONGJMP(ptr) (fn_png_longjmp (png_ptr, 1)) 5676#define PNG_LONGJMP(ptr) (fn_png_longjmp ((ptr), 1))
5677#define PNG_JMPBUF(ptr) \ 5677#define PNG_JMPBUF(ptr) \
5678 (*(jmp_buf *)(fn_png_set_longjmp_fn((ptr), longjmp, sizeof (jmp_buf)))) 5678 (*(jmp_buf *)(fn_png_set_longjmp_fn((ptr), longjmp, sizeof (jmp_buf))))
5679#endif 5679#endif