Fix lots of warnings about pointers cast to integers and the like on

alpha.  Fixes PR# 5454 by Johnny C. Lam.  Now builds cleanly on LP64.

7 files changed, 131 insertions, 1 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 09a89b06375..00ceead7d83 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:28 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1998/10/27 07:21:19 garbled Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/13 23:29:52 jmz Exp
 #
 
@@ -15,6 +15,12 @@ SCRIPTS_ENV=	"LANG=${LANG}"
 
 .include "../../mk/bsd.prefs.mk"
 
+_INTTYPES!=	if [ -e /usr/include/inttypes.h ]; then echo "Exists"; else echo "No go"; fi
+
+.if (${_INTTYPES} == "Exists")
+CFLAGS+= -DHAVE_INTTYPES_H
+.endif
+
 pre-extract pre-build pre-install:
 .if !defined(ISPELL_FR)
 	@echo '******************************************************'
diff --git a/textproc/ispell/patches/patch-ac b/textproc/ispell/patches/patch-ac
new file mode 100644
index 00000000000..0d95dd72135
--- /dev/null
+++ b/textproc/ispell/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 1998/10/27 07:21:19 garbled Exp $
+--- ispell.h.orig	Mon Oct 26 23:13:30 1998
++++ ispell.h	Mon Oct 26 23:16:48 1998
+@@ -90,6 +90,16 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#define PTRSIZE intptr_t
++#else
++#define PTRSIZE int
++#endif
++#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__)
++#define PTRSIZE long
++#endif /* hack for 1.3 */
++
+ #ifdef __STDC__
+ #define P(x)	x
+ #define VOID	void
+@@ -336,8 +346,8 @@
+     short maxstringcharlen;			/* Max strchr len supported */
+     short compoundmin;				/* Min lth of compound parts */
+     short compoundbit;				/* Flag 4 compounding roots */
+-    int stringsize;				/* Size of string table */
+-    int lstringsize;				/* Size of lang. str tbl */
++    PTRSIZE stringsize;				/* Size of string table */
++    PTRSIZE lstringsize;			/* Size of lang. str tbl */
+     int tblsize;				/* No. entries in hash tbl */
+     int stblsize;				/* No. entries in sfx tbl */
+     int ptblsize;				/* No. entries in pfx tbl */
diff --git a/textproc/ispell/patches/patch-ad b/textproc/ispell/patches/patch-ad
new file mode 100644
index 00000000000..727a5604062
--- /dev/null
+++ b/textproc/ispell/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 1998/10/27 07:21:19 garbled Exp $
+--- buildhash.c.orig	Mon Jan 23 11:28:24 1995
++++ buildhash.c	Mon Oct 26 23:20:42 1998
+@@ -211,7 +211,7 @@
+     {
+     register FILE *		houtfile;
+     register struct dent *	dp;
+-    int				strptr;
++    PTRSIZE				strptr;
+     int				n;
+     int				i;
+     int				maxplen;
+@@ -336,7 +336,7 @@
+ 	{
+ 	if (dp->next != 0)
+ 	    {
+-	    int		x;
++	    PTRSIZE		x;
+ 	    x = dp->next - hashtbl;
+ 	    dp->next = (struct dent *)x;
+ 	    }
diff --git a/textproc/ispell/patches/patch-ae b/textproc/ispell/patches/patch-ae
new file mode 100644
index 00000000000..8f7f2d89825
--- /dev/null
+++ b/textproc/ispell/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.1 1998/10/27 07:21:19 garbled Exp $
+--- lookup.c.orig	Mon Oct 26 23:24:20 1998
++++ lookup.c	Mon Oct 26 23:25:41 1998
+@@ -212,22 +212,22 @@
+ 	    if (dp->word == (char *) -1)
+ 		dp->word = NULL;
+ 	    else
+-		dp->word = &hashstrings [ (int)(dp->word) ];
++		dp->word = &hashstrings [ (PTRSIZE)(dp->word) ];
+ 	    if (dp->next == (struct dent *) -1)
+ 		dp->next = NULL;
+ 	    else
+-		dp->next = &hashtbl [ (int)(dp->next) ];
++		dp->next = &hashtbl [ (PTRSIZE)(dp->next) ];
+ 	    }
+ 	}
+ 
+     for (i = numsflags + numpflags, entry = sflaglist; --i >= 0; entry++)
+ 	{
+ 	if (entry->stripl)
+-	    entry->strip = (ichar_t *) &hashstrings[(int) entry->strip];
++	    entry->strip = (ichar_t *) &hashstrings[(PTRSIZE) entry->strip];
+ 	else
+ 	    entry->strip = NULL;
+ 	if (entry->affl)
+-	    entry->affix = (ichar_t *) &hashstrings[(int) entry->affix];
++	    entry->affix = (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
+ 	else
+ 	    entry->affix = NULL;
+ 	}
diff --git a/textproc/ispell/patches/patch-af b/textproc/ispell/patches/patch-af
new file mode 100644
index 00000000000..b9743bd96dd
--- /dev/null
+++ b/textproc/ispell/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 1998/10/27 07:21:19 garbled Exp $
+--- fields.c.orig	Mon Oct 26 23:27:45 1998
++++ fields.c	Mon Oct 26 23:31:02 1998
+@@ -32,6 +32,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "config.h"
+ #include "fields.h"
+ 
+@@ -62,7 +63,7 @@
+ extern char *	malloc ();
+ extern char *	realloc ();
+ extern char *	strchr ();
+-extern int	strlen ();
++/* extern int	strlen ();*/
+ 
+ /*
+  * Read one line of the given file into a buffer, break it up into
diff --git a/textproc/ispell/patches/patch-ag b/textproc/ispell/patches/patch-ag
new file mode 100644
index 00000000000..4a239c81737
--- /dev/null
+++ b/textproc/ispell/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 1998/10/27 07:21:19 garbled Exp $
+--- sq.c.orig	Mon Oct 26 23:28:32 1998
++++ sq.c	Mon Oct 26 23:28:58 1998
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #ifdef __STDC__
+ #define P(x)	x
diff --git a/textproc/ispell/patches/patch-ah b/textproc/ispell/patches/patch-ah
new file mode 100644
index 00000000000..30a25747615
--- /dev/null
+++ b/textproc/ispell/patches/patch-ah
@@ -0,0 +1,11 @@
+$NetBSD: patch-ah,v 1.1 1998/10/27 07:21:19 garbled Exp $
+--- unsq.c.orig	Mon Oct 26 23:28:34 1998
++++ unsq.c	Mon Oct 26 23:29:08 1998
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "msgs.h"
+ 
+ #ifdef __STDC__