[gentoo-commits] gentoo commit in src/patchsets/emacs/22.3: 10_all_libpng15.patch

[Ulrich Mueller (ulm)]

ulm         11/09/27 16:00:25

  Added:                10_all_libpng15.patch
  Log:
  Fix compilation with libpng-1.5, bug 384553.

Revision  Changes    Path
1.1                  src/patchsets/emacs/22.3/10_all_libpng15.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/22.3/10_all_libpng15.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/22.3/10_all_libpng15.patch?rev=1.1&content-type=text/plain

Index: 10_all_libpng15.patch
===================================================================
https://bugs.gentoo.org/384553

--- emacs-22.3-orig/src/image.c
+++ emacs-22.3/src/image.c
@@ -6427,7 +6427,7 @@
 {
   xassert (png_ptr != NULL);
   image_error ("PNG error: %s", build_string (msg), Qnil);
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 
@@ -6603,7 +6603,7 @@
 
   /* Set error jump-back.  We come back here when the PNG library
      detects an error.  */
-  if (setjmp (png_ptr->jmpbuf))
+  if (setjmp (png_jmpbuf (png_ptr)))
     {
     error:
       if (png_ptr)