[pkgsrc/trunk]: pkgsrc/graphics/png Convert a C99-ism to C89 to make this bui...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75be25d4b89c
branches:  trunk
changeset: 479238:75be25d4b89c
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Mon Aug 09 10:49:00 2004 +0000

description:
Convert a C99-ism to C89 to make this build with gcc 2.95.

This fixes PR 26602 submitted by Hauke Fath.

diffstat:

 graphics/png/distinfo         |   4 ++--
 graphics/png/patches/patch-ab |  23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r b95ad517801d -r 75be25d4b89c graphics/png/distinfo
--- a/graphics/png/distinfo     Mon Aug 09 10:06:13 2004 +0000
+++ b/graphics/png/distinfo     Mon Aug 09 10:49:00 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2004/08/09 07:37:35 recht Exp $
+$NetBSD: distinfo,v 1.21 2004/08/09 10:49:00 kristerw Exp $
 
 SHA1 (libpng-1.2.6rc2.tar.bz2) = c149c61a2595c9c5ddf4d60d45ed529c47de5c75
 Size (libpng-1.2.6rc2.tar.bz2) = 377856 bytes
 SHA1 (patch-aa) = 0b3d28e526f8d1530e82c30be46aea19e5a32d6a
-SHA1 (patch-ab) = 58b007d8ac0a41118b90e826ec2df32f64b06411
+SHA1 (patch-ab) = e43e77be19c1677e7039d4e0fa91128d9f2f1602
 SHA1 (patch-ad) = 5b880c6d47682349bd994eaea8aeac6c51d264e5
 SHA1 (patch-ae) = d5be0cdcfdd6c30a17b9633e28afb868911195aa
diff -r b95ad517801d -r 75be25d4b89c graphics/png/patches/patch-ab
--- a/graphics/png/patches/patch-ab     Mon Aug 09 10:06:13 2004 +0000
+++ b/graphics/png/patches/patch-ab     Mon Aug 09 10:49:00 2004 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.7 2004/08/09 07:37:35 recht Exp $
+$NetBSD: patch-ab,v 1.8 2004/08/09 10:49:00 kristerw Exp $
 
---- pngtest.c.orig     2004-08-08 04:42:44.000000000 +0200
-+++ pngtest.c  2004-08-08 12:27:49.000000000 +0200
-@@ -579,7 +579,7 @@
+--- pngtest.c.orig     Sun Aug  8 04:42:44 2004
++++ pngtest.c  Mon Aug  9 12:44:34 2004
+@@ -511,8 +511,9 @@
+       buffer and once to get a new free list entry. */
+    {
+       /* Disable malloc_fn and free_fn */
++      memory_infop pinfo;
+       png_set_mem_fn(png_ptr, NULL, NULL, NULL);
+-      memory_infop pinfo = (memory_infop)png_malloc(png_ptr,
++      pinfo = (memory_infop)png_malloc(png_ptr,
+          (png_uint_32)png_sizeof (*pinfo));
+       pinfo->size = size;
+       current_allocation += size;
+@@ -579,7 +580,7 @@
           }
           if (pinfo->next == NULL)
           {
@@ -11,7 +22,7 @@
              break;
           }
           ppinfo = &pinfo->next;
-@@ -1438,8 +1438,8 @@
+@@ -1438,8 +1439,8 @@
                 current_allocation);
              while (pinfo != NULL)
              {
@@ -22,7 +33,7 @@
                 pinfo = pinfo->next;
              }
           }
-@@ -1513,8 +1513,8 @@
+@@ -1513,8 +1514,8 @@
                  current_allocation);
               while (pinfo != NULL)
               {