Fix main()

5 files changed, 65 insertions, 4 deletions

diff --git a/misc/xjdic/distinfo b/misc/xjdic/distinfo
index 8a8a89cfdd6..8370b9100a2 100644
--- a/misc/xjdic/distinfo
+++ b/misc/xjdic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/11/10 10:23:15 dogcow Exp $
+$NetBSD: distinfo,v 1.8 2013/01/17 16:00:02 joerg Exp $
 
 SHA1 (xjdic-24.locale.patch) = fdd9a6d12a9c2098c315364ad79fe77527f8b43e
 RMD160 (xjdic-24.locale.patch) = 3a7bd300f44e17f668213dd66dcb2fe3b377ff21
@@ -10,4 +10,7 @@ SHA1 (patch-aa) = 7e3dad15962b0ac69bf25c6f98cbbff8925aed8d
 SHA1 (patch-ab) = 26bfeffcb8d56d99922164410b9ffe98ec5e8412
 SHA1 (patch-ac) = 06e8b8ebace1c12e7dbf944d9d6b34d8f5c9acc8
 SHA1 (patch-ad) = 57cf0f53d498c7c4af9dfa3dbf6fd76c4f3dfa26
-SHA1 (patch-ae) = 62f4b5034607764a4603ae4c285f7f97ce5d0c5a
+SHA1 (patch-ae) = 7a672438936f7b0827bc0e3b55ac9dc0c3a6c9f8
+SHA1 (patch-exjdxgen.c) = 5e6680216435f170716134ec945b22363a15b60a
+SHA1 (patch-xjdfrontend.c) = 87535787a34168b53467214ecbd419b9ff5b9454
+SHA1 (patch-xjdxgen.c) = f83ce54475dc88d363cf7820d235a2e1454c699d
diff --git a/misc/xjdic/patches/patch-ae b/misc/xjdic/patches/patch-ae
index e5137929ca6..30f55cf6762 100644
--- a/misc/xjdic/patches/patch-ae
+++ b/misc/xjdic/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2006/01/03 16:00:57 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2013/01/17 16:00:02 joerg Exp $
 
---- xjdserver.c.orig	2006-01-03 15:59:16.000000000 +0000
+--- xjdserver.c.orig	2003-05-28 05:58:02.000000000 +0000
 +++ xjdserver.c
 @@ -20,6 +20,7 @@
  
@@ -19,3 +19,15 @@ $NetBSD: patch-ae,v 1.1 2006/01/03 16:00:57 joerg Exp $
  extern unsigned char Dnamet[10][100],XJDXnamet[10][100];
  extern unsigned char *dicbufft[10];
  extern unsigned long diclent[10], indlent[10],indptrt[10];
+@@ -142,10 +141,7 @@ void sendresponse()
+ 
+ /*                  M A I N                                      */
+ 
+-main(argc,argv)
+-int argc;
+-unsigned char **argv;
+-
++main(int argc, char **argv)
+ {
+ 	int iterlimit,i;
+   	unsigned char *dicenv,strtmp[50];
diff --git a/misc/xjdic/patches/patch-exjdxgen.c b/misc/xjdic/patches/patch-exjdxgen.c
new file mode 100644
index 00000000000..39a511fa53c
--- /dev/null
+++ b/misc/xjdic/patches/patch-exjdxgen.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-exjdxgen.c,v 1.1 2013/01/17 16:00:02 joerg Exp $
+
+--- exjdxgen.c.orig	2013-01-16 14:03:20.000000000 +0000
++++ exjdxgen.c
+@@ -66,9 +66,7 @@ int stringcomp(unsigned char *s1, unsign
+ }
+ 
+ /*====function to Load Dictionary and load/create index table=======*/
+-main(argc,argv)
+-int argc;
+-unsigned char **argv;
++main(int argc, char **argv)
+ {
+   FILE *fp,*fopen();
+   unsigned long schi,diclen,indlen;
diff --git a/misc/xjdic/patches/patch-xjdfrontend.c b/misc/xjdic/patches/patch-xjdfrontend.c
new file mode 100644
index 00000000000..43eabd50428
--- /dev/null
+++ b/misc/xjdic/patches/patch-xjdfrontend.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-xjdfrontend.c,v 1.1 2013/01/17 16:00:02 joerg Exp $
+
+--- xjdfrontend.c.orig	2013-01-16 14:01:40.000000000 +0000
++++ xjdfrontend.c
+@@ -2917,10 +2917,7 @@ void FiltSet()
+ 
+ /*                  M A I N                                      */
+ 
+-main(argc,argv)
+-int argc;
+-unsigned char **argv;
+-
++main(int argc, char **argv)
+ {
+ 	int i,j,ip,cmdmode,bit8,escf;
+   	unsigned char *dicenv,strtmp[50];
diff --git a/misc/xjdic/patches/patch-xjdxgen.c b/misc/xjdic/patches/patch-xjdxgen.c
new file mode 100644
index 00000000000..a41a03e7595
--- /dev/null
+++ b/misc/xjdic/patches/patch-xjdxgen.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-xjdxgen.c,v 1.1 2013/01/17 16:00:02 joerg Exp $
+
+--- xjdxgen.c.orig	2013-01-16 14:02:59.000000000 +0000
++++ xjdxgen.c
+@@ -74,9 +74,7 @@ int stringcomp(unsigned char *s1, unsign
+ }
+ 
+ /*====function to Load Dictionary and load/create index table=======*/
+-main(argc,argv)
+-int argc;
+-unsigned char **argv;
++main(int argc,char **argv)
+ {
+   FILE *fp,*fopen();
+   unsigned long possav,schi,diclen,indlen;