view src/plotutils-2.6-libpng-1.5.patch @ 4407:e9b032b9340a

octave: cross-compile gnulib time functions correctly (bug #51351) * default-octave.mk: Define gl_cv_func_tzset_clobber=no to bypass faulty configure test when cross-compiling. * octave.mk: Likewise. * stable-octave.mk: Likewise.
author Mike Miller <mtmiller@octave.org>
date Sat, 08 Jul 2017 08:55:57 -0700
parents 99516e73b368
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
fix building with libpng-1.5

--- a/libplot/z_write.c
+++ b/libplot/z_write.c
@@ -164,7 +164,7 @@
     }
 
   /* cleanup after libpng errors (error handler does a longjmp) */
-  if (setjmp (png_ptr->jmpbuf))
+  if (png_jmpbuf (png_ptr))
     {
       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
       return -1;
@@ -444,7 +444,7 @@
 #endif
     }
 
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 static void 
@@ -515,7 +515,7 @@
 #endif
     }
 
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 static void