[pkgsrc/trunk]: pkgsrc/net/bing Remove conflicting definition of malloc(); in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3195ee6158af
branches:  trunk
changeset: 516474:3195ee6158af
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Jul 21 16:19:58 2006 +0000

description:
Remove conflicting definition of malloc(); include stdlib.h instead.

diffstat:

 net/bing/distinfo         |   4 ++--
 net/bing/patches/patch-ab |  21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r ee993d3c6237 -r 3195ee6158af net/bing/distinfo
--- a/net/bing/distinfo Fri Jul 21 16:17:55 2006 +0000
+++ b/net/bing/distinfo Fri Jul 21 16:19:58 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/12/18 18:44:08 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/07/21 16:19:58 minskim Exp $
 
 SHA1 (bing-1.0.4.tar.gz) = 21954516f4b72895ad7be96d320581510a186b33
 RMD160 (bing-1.0.4.tar.gz) = e434ea8705677234ac289ff9f2a72cdffbb89aa6
 Size (bing-1.0.4.tar.gz) = 27069 bytes
 SHA1 (patch-aa) = e5dc4b78498674beacaecaf63f9799a4260c8187
-SHA1 (patch-ab) = 32bb52f59fd9f08779c969a8603633013d042ef7
+SHA1 (patch-ab) = e6b5b12e03e2c7d99330a3b86e5a8626707e31af
diff -r ee993d3c6237 -r 3195ee6158af net/bing/patches/patch-ab
--- a/net/bing/patches/patch-ab Fri Jul 21 16:17:55 2006 +0000
+++ b/net/bing/patches/patch-ab Fri Jul 21 16:19:58 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2005/12/18 18:44:09 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2006/07/21 16:19:58 minskim Exp $
 
 --- bing.c.orig        1995-07-20 23:45:32.000000000 +0000
 +++ bing.c
@@ -11,7 +11,15 @@
  
  #include <netinet/in_systm.h>
  #include <netinet/in.h>
-@@ -1221,7 +1221,7 @@ int main(argc, argv)
+@@ -169,6 +169,7 @@ static char rcsid[] = "bing.c,v 1.16 199
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <limits.h>
+ 
+@@ -1221,7 +1222,7 @@ int main(argc, argv)
        int argc;
        char **argv;
  {
@@ -20,3 +28,12 @@
        extern char *optarg;
        struct protoent *proto;
        struct in_addr ifaddr;
+@@ -1230,7 +1231,7 @@ int main(argc, argv)
+       int i;
+       int ch, hold, recv_packlen, preload;
+       u_char *datap, *recv_packet;
+-      char *target1, *target2, *malloc();
++      char *target1, *target2;
+       u_char ttl, loop;
+ #ifdef IP_OPTIONS
+       char rspace[3 + 4 * NROUTES + 1];       /* record route space */