Fix malloc.h usage.

4 files changed, 37 insertions, 11 deletions

diff --git a/mbone/nte/distinfo b/mbone/nte/distinfo
index 59b7a7c0e2d..17e3b44fb7b 100644
--- a/mbone/nte/distinfo
+++ b/mbone/nte/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/01/03 18:40:16 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/08/10 14:07:22 joerg Exp $
 
 SHA1 (nt.1.5a23.tar.gz) = d3ffa9d1fcb08cc0daeaba145108125ad0521483
 RMD160 (nt.1.5a23.tar.gz) = 05c3317837921e07a4f89fb86799c565c5d1314e
@@ -8,8 +8,9 @@ SHA1 (patch-ab) = 5a1fb9da5fed272fa2e5fcb1b5abee14e92d4f87
 SHA1 (patch-ac) = 614aeb5e6cde656c1e4471ef6a4bdb19331321f2
 SHA1 (patch-ad) = d21ed52b98d283e3d7cca202cf9a4b48672fbf8b
 SHA1 (patch-ae) = d7ef2e5964fb5f4deb202d98fbeb5e46db278c26
-SHA1 (patch-af) = dddf6b44e9f5996ef481c674644d4ef3b79b3267
+SHA1 (patch-af) = de9d8194a9d7198cdb2d1c4442a7097335446058
 SHA1 (patch-ag) = bffb4805f2a1d039157cf70578f54bbbd2480d16
 SHA1 (patch-ah) = df6bf1d8c9e40e3f8dfd7a7d3d37059d656b13fe
 SHA1 (patch-ai) = 975c7a56b0a9c8ab9b3f8b074cfd293258edf2c9
-SHA1 (patch-aj) = 4f13d22c9a42b35c5333e8797d50b4a1e2d8ab79
+SHA1 (patch-aj) = bc1e84ff2c979537a70ac75dcfe6775fe753802f
+SHA1 (patch-ak) = 8dcc3ad7e7a0e97e557586d0e8edd3cd02680367
diff --git a/mbone/nte/patches/patch-af b/mbone/nte/patches/patch-af
index 9c39ae56113..daedad93c0a 100644
--- a/mbone/nte/patches/patch-af
+++ b/mbone/nte/patches/patch-af
@@ -1,8 +1,17 @@
-$NetBSD: patch-af,v 1.1 2000/12/03 06:17:37 mycroft Exp $
+$NetBSD: patch-af,v 1.2 2007/08/10 14:07:22 joerg Exp $
 
---- src/hsearch.c.orig	Wed Sep  4 10:54:03 1996
-+++ src/hsearch.c	Sun Dec  3 06:09:08 2000
-@@ -55,7 +55,7 @@
+--- src/hsearch.c.orig	1996-09-04 10:54:03.000000000 +0000
++++ src/hsearch.c
+@@ -19,7 +19,7 @@ not, write to the Free Software Foundati
+ Cambridge, MA 02139, USA.  */
+ 
+ #include "ansidecl.h"
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include "search.h"
+@@ -55,7 +55,7 @@ static unsigned   filled;
   */
  
  static int
@@ -11,7 +20,7 @@ $NetBSD: patch-af,v 1.1 2000/12/03 06:17:37 mycroft Exp $
  {
      /* no even number will be passed */
      unsigned div = 3;
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ DEFUN(isprime, (number), unsigned number
   */
  
  int
diff --git a/mbone/nte/patches/patch-aj b/mbone/nte/patches/patch-aj
index e9feda56bf7..782388651b3 100644
--- a/mbone/nte/patches/patch-aj
+++ b/mbone/nte/patches/patch-aj
@@ -1,15 +1,19 @@
-$NetBSD: patch-aj,v 1.1 2006/01/03 18:40:16 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2007/08/10 14:07:22 joerg Exp $
 
 --- src/qfdes/qfDES-memory.c.orig	1996-09-04 13:16:14.000000000 +0000
 +++ src/qfdes/qfDES-memory.c
-@@ -10,6 +10,7 @@ February 1993
+@@ -10,9 +10,10 @@ February 1993
  #if !defined(_qfDES_memory_c_)
  #define      _qfDES_memory_c_
  
 +#include <errno.h>
  #include <stdio.h>
  #include <memory.h>
- #include <malloc.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include "qfDES.h"
+ 
 @@ -20,8 +21,6 @@ February 1993
   extern int sys_nerr;
   extern char *sys_errlist[];
diff --git a/mbone/nte/patches/patch-ak b/mbone/nte/patches/patch-ak
new file mode 100644
index 00000000000..fc913f837d5
--- /dev/null
+++ b/mbone/nte/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2007/08/10 14:07:22 joerg Exp $
+
+--- src/www_fns.c.orig	2007-08-10 13:11:03.000000000 +0000
++++ src/www_fns.c
+@@ -42,7 +42,6 @@
+ #include "ui_fns.h"
+ #include <tcl.h>
+ #include <tk.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>