From 46f88c11388317086f7963b7ff3cfdd0aad48941 Mon Sep 17 00:00:00 2001
From: Sean Eric Fagan <sef@cygnus>
Date: Fri, 27 Mar 1992 22:11:14 +0000
Subject: [PATCH] More cleanups for gprof, especially with the '386 target.

---
 gprof/gprof.c | 6 +++---
 gprof/i386.c  | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gprof/gprof.c b/gprof/gprof.c
index b2c5e33f0b..ce4c4e0f33 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -230,7 +230,7 @@ bfd	*abfd;
     i = get_symtab_upper_bound (abfd);	/* This will probably give us more
 					 * than we need, but that's ok.
 					 */
-    syms = malloc (i);
+    syms = (asymbol**)malloc (i);
     nosyms = bfd_canonicalize_symtab (abfd, syms);
 
     nname = 0;
@@ -355,8 +355,8 @@ openpfile(filename)
 	done();
     }
     fread(&tmp, sizeof(struct hdr), 1, pfile);
-    tmp.lowpc = bfd_get_32 (abfd, &tmp.lowpc);
-    tmp.highpc = bfd_get_32 (abfd, &tmp.highpc);
+    tmp.lowpc = (char*)bfd_get_32 (abfd, &tmp.lowpc);
+    tmp.highpc = (char*)bfd_get_32 (abfd, &tmp.highpc);
     tmp.ncnt = bfd_get_32 (abfd, &tmp.ncnt);
 
     if ( s_highpc != 0 && ( tmp.lowpc != h.lowpc ||
diff --git a/gprof/i386.c b/gprof/i386.c
index dc28611b30..50e99803ef 100644
--- a/gprof/i386.c
+++ b/gprof/i386.c
@@ -47,8 +47,14 @@ nltype	indirectchild = {
 	(arctype *) 0 			/* list of callee arcs */
     };
 
+#ifdef	__STDC__
 int
-iscall (unsigned char *ip) {
+iscall (unsigned char *ip)
+#else
+int iscall(ip)
+	unsigned char *ip;
+#endif	/* __STDC__ */
+{
   if (*ip == 0xeb || *ip == 0x9a) 
     return 1;
   return 0;