Use correct types for frompcindex and toindex variables.

2 files changed, 7 insertions, 5 deletions

diff --git a/gmon/gmon.c b/gmon/gmon.c
index c2fcb8fd75..72654840fc 100644
--- a/gmon/gmon.c
+++ b/gmon/gmon.c
@@ -141,9 +141,9 @@ __monstartup (lowpc, highpc)
     }
   p->tos = (struct tostruct *)cp;
   cp += p->tossize;
-  p->kcount = (u_short *)cp;
+  p->kcount = (HISTCOUNTER *)cp;
   cp += p->kcountsize;
-  p->froms = (u_short *)cp;
+  p->froms = (ARCINDEX *)cp;
 
   p->tos[0].link = 0;
 
@@ -212,7 +212,8 @@ write_call_graph (fd)
   u_char tag = GMON_TAG_CG_ARC;
   struct gmon_cg_arc_record raw_arc[NARCS_PER_WRITEV]
     __attribute__ ((aligned (__alignof__ (char*))));
-  int from_index, to_index, from_len;
+  ARCINDEX from_index, to_index;
+  int from_len;
   u_long frompc;
   struct iovec iov[2 * NARCS_PER_WRITEV];
   int nfilled;
diff --git a/gmon/mcount.c b/gmon/mcount.c
index f6eb229e2e..8e54812d75 100644
--- a/gmon/mcount.c
+++ b/gmon/mcount.c
@@ -31,6 +31,7 @@
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
 
+#include <unistd.h>
 #include <sys/param.h>
 #include <sys/gmon.h>
 
@@ -57,10 +58,10 @@ static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
  */
 _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 {
-	register u_short *frompcindex;
+	register ARCINDEX *frompcindex;
 	register struct tostruct *top, *prevtop;
 	register struct gmonparam *p;
-	register long toindex;
+	register ARCINDEX toindex;
 	int i;
 
 	p = &_gmonparam;