From edb7da6cb8666ad1069cc7b954e20a14eb8185bf Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Wed, 21 Jun 2006 15:15:16 +0000
Subject: Remove conflicting declaration of malloc(); include stdlib.h instead.

---
 inputmethod/ja-freewnn-lib/distinfo         |  4 ++--
 inputmethod/ja-freewnn-lib/patches/patch-ag | 30 ++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'inputmethod')

diff --git a/inputmethod/ja-freewnn-lib/distinfo b/inputmethod/ja-freewnn-lib/distinfo
index 62170e7f9f3..2367b34716c 100644
--- a/inputmethod/ja-freewnn-lib/distinfo
+++ b/inputmethod/ja-freewnn-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/05/02 08:00:08 yyamano Exp $
+$NetBSD: distinfo,v 1.9 2006/06/21 15:15:16 minskim Exp $
 
 SHA1 (freewnn/FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
 RMD160 (freewnn/FreeWnn-1.10.tar.gz) = 8644371c258b1f32c36d5f0318032a0a50c5f640
@@ -12,7 +12,7 @@ SHA1 (patch-ac) = 7de643962ca2155d5bbe69e0684e235d5c61a15e
 SHA1 (patch-ad) = b78a1c7c5358a2114fa99249b08a06274d03a187
 SHA1 (patch-ae) = e33833015936ce9c5ef65a97faf3f05f0c464ddc
 SHA1 (patch-af) = 26d45af3c65df5af5299c837a123129ec5919bd4
-SHA1 (patch-ag) = bf3d35e2499a602862758b322970c765ffea4052
+SHA1 (patch-ag) = 8668a1200b775b56c6a173bf85a7cf29d887803c
 SHA1 (patch-ah) = 1795d35ffc0bdbc3d082c46afb86d616bef52d68
 SHA1 (patch-ai) = ecba683c308c4acf69f0e5835ee241dfbab5b71a
 SHA1 (patch-aj) = 33420feacb29abd59882672dfeb254527aa99fe6
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ag b/inputmethod/ja-freewnn-lib/patches/patch-ag
index 4194b0f1799..64ac70853ee 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ag
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ag
@@ -1,8 +1,19 @@
-$NetBSD: patch-ag,v 1.4 2005/12/30 21:51:23 joerg Exp $
+$NetBSD: patch-ag,v 1.5 2006/06/21 15:15:16 minskim Exp $
 
---- Wnn/jlib/js.c.orig	Mon May 17 12:04:45 1999
-+++ Wnn/jlib/js.c	Wed Sep 22 18:37:26 1999
-@@ -85,7 +85,6 @@ extern	char	*malloc();
+--- Wnn/jlib/js.c.orig	1999-05-17 03:04:45.000000000 +0000
++++ Wnn/jlib/js.c
+@@ -70,9 +70,8 @@ extern	Variables
+ */
+ 
+ 
+-extern	char	*malloc();
+-
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #ifdef UX386
+ #include <X11/Xos.h>
+@@ -85,7 +84,6 @@ extern	char	*malloc();
  #endif
  #include <sys/stat.h>
  #include <errno.h>
@@ -10,7 +21,16 @@ $NetBSD: patch-ag,v 1.4 2005/12/30 21:51:23 joerg Exp $
  #include <signal.h>
  #include "jd_sock.h"
  #include "commonhd.h"
-@@ -220,11 +219,11 @@ register char *lang;
+@@ -103,8 +101,6 @@ extern int errno;
+ #include "../etc/bdic.c"
+ #include "../etc/pwd.c"
+ 
+-char *malloc();
+-
+ #ifdef SYSVR2
+ #define	bzero(adr,n)	memset((adr),0,(n))
+ #endif
+@@ -220,11 +216,11 @@ register char *lang;
  #endif
  	return -1;
      }
-- 
cgit v1.2.3