Support compiling with `gcc -ansi'.

9 files changed, 33 insertions, 32 deletions

diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index e1f1f61..e87a9d9 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.23 1998/03/29 11:55:06 phk Exp $
+ * $Id: random_machdep.c,v 1.24 1998/04/06 09:30:32 phk Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -136,7 +136,7 @@ rand_initialize(void)
  * scancodes, for example), the upper bits of the entropy pool don't
  * get affected. --- TYT, 10/11/95
  */
-static inline void
+static __inline void
 add_entropy_word(struct random_bucket *r, const u_int32_t input)
 {
 	u_int i;
@@ -253,7 +253,7 @@ add_blkdev_randomness(int major)
  * bits of entropy are left in the pool, but it does not restrict the
  * number of bytes that are actually obtained.
  */
-static inline int
+static __inline int
 extract_entropy(struct random_bucket *r, char *buf, int nbytes)
 {
 	int ret, i;
diff --git a/sys/kern/ksched.c b/sys/kern/ksched.c
index c59fc05..fa66de5 100644
--- a/sys/kern/ksched.c
+++ b/sys/kern/ksched.c
@@ -87,7 +87,7 @@ int ksched_detach(struct ksched *p)
 #define p4prio_to_rtpprio(P) (RTP_PRIO_MAX - (P))
 #define rtpprio_to_p4prio(P) (RTP_PRIO_MAX - (P))
 
-static inline int
+static __inline int
 getscheduler(int *ret, struct ksched *ksched, struct proc *p)
 {
 	int e = 0;
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index ff2fd57..f300fa1 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -22,7 +22,7 @@
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
  *
- * $Id: md5c.c,v 1.11 1998/03/27 10:23:00 phk Exp $
+ * $Id: md5c.c,v 1.12 1998/03/29 11:54:52 phk Exp $
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
@@ -44,16 +44,17 @@
 #define memcpy(x,y,z)	bcopy(y, x, z)
 #endif
 
-#ifdef i386
+#ifdef __i386
 #define Encode memcpy
 #define Decode memcpy
-#else /* i386 */
+#else /* __i386 */
 
 /*
  * Encodes input (u_int32_t) into output (unsigned char). Assumes len is
  * a multiple of 4.
  */
 
+/* XXX not prototyped, and not compatible with memcpy(). */
 static void
 Encode (output, input, len)
 	unsigned char *output;
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 3a806b6..d990a12 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.27 1997/03/24 11:24:37 bde Exp $
+ * $Id: tty_subr.c,v 1.28 1997/10/12 20:24:09 phk Exp $
  */
 
 /*
@@ -91,7 +91,7 @@ clist_init(dummy)
  * Remove a cblock from the cfreelist queue and return a pointer
  * to it.
  */
-static inline struct cblock *
+static __inline struct cblock *
 cblock_alloc()
 {
 	struct cblock *cblockp;
@@ -108,7 +108,7 @@ cblock_alloc()
 /*
  * Add a cblock to the cfreelist queue.
  */
-static inline void
+static __inline void
 cblock_free(cblockp)
 	struct cblock *cblockp;
 {
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 0d571e1..c674c58 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id: subr_prof.c,v 1.23 1997/10/27 17:23:08 bde Exp $
+ * $Id: subr_prof.c,v 1.24 1997/11/06 19:29:18 phk Exp $
  */
 
 #include <sys/param.h>
@@ -161,11 +161,11 @@ kmstartup(dummy)
 
 	startguprof(p);
 	for (i = 0; i < CALIB_SCALE; i++)
-#if defined(i386) && __GNUC__ >= 2
-		asm("pushl %0; call __mcount; popl %%ecx"
-		    :
-		    : "i" (profil)
-		    : "ax", "bx", "cx", "dx", "memory");
+#if defined(__i386) && __GNUC__ >= 2
+		__asm("pushl %0; call __mcount; popl %%ecx"
+		      :
+		      : "i" (profil)
+		      : "ax", "bx", "cx", "dx", "memory");
 #else
 #error
 #endif
@@ -173,10 +173,10 @@ kmstartup(dummy)
 
 	startguprof(p);
 	for (i = 0; i < CALIB_SCALE; i++)
-#if defined(i386) && __GNUC__ >= 2
-		    asm("call mexitcount; 1:"
-			: : : "ax", "bx", "cx", "dx", "memory");
-	asm("movl $1b,%0" : "=rm" (tmp_addr));
+#if defined(__i386) && __GNUC__ >= 2
+		    __asm("call mexitcount; 1:"
+			  : : : "ax", "bx", "cx", "dx", "memory");
+	__asm("movl $1b,%0" : "=rm" (tmp_addr));
 #else
 #error
 #endif
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 17b4055..c96d156 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,7 +54,7 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- *	$Id: subr_rlist.c,v 1.24 1998/02/04 22:32:35 eivind Exp $
+ *	$Id: subr_rlist.c,v 1.25 1998/02/06 12:13:26 eivind Exp $
  */
 
 #include <sys/param.h>
@@ -73,7 +73,7 @@ static int rlist_count=0;
 static struct rlist *rlfree;
 
 static struct rlist	*rlist_malloc __P((void));
-static inline void	rlist_mfree __P((struct rlist *rl));
+static __inline void	rlist_mfree __P((struct rlist *rl));
 
 static struct rlist *
 rlist_malloc()
@@ -103,7 +103,7 @@ rlist_malloc()
 	return rl;
 }
 
-static inline void
+static __inline void
 rlist_mfree(rl)
 	struct rlist *rl;
 {
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index e840062..7f0f801 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.124 1998/03/28 10:32:57 bde Exp $
+ *	$Id: trap.c,v 1.125 1998/03/30 09:48:27 phk Exp $
  */
 
 /*
@@ -143,15 +143,15 @@ static char *trap_msg[] = {
 	"machine check trap",			/* 28 T_MCHK */
 };
 
-static void userret __P((struct proc *p, struct trapframe *frame,
-			 u_quad_t oticks));
+static __inline void userret __P((struct proc *p, struct trapframe *frame,
+				  u_quad_t oticks));
 
 #if defined(I586_CPU) && !defined(NO_F00F_HACK)
 extern struct gate_descriptor *t_idt;
 extern int has_f00f_bug;
 #endif
 
-static inline void
+static __inline void
 userret(p, frame, oticks)
 	struct proc *p;
 	struct trapframe *frame;
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 3a806b6..d990a12 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.27 1997/03/24 11:24:37 bde Exp $
+ * $Id: tty_subr.c,v 1.28 1997/10/12 20:24:09 phk Exp $
  */
 
 /*
@@ -91,7 +91,7 @@ clist_init(dummy)
  * Remove a cblock from the cfreelist queue and return a pointer
  * to it.
  */
-static inline struct cblock *
+static __inline struct cblock *
 cblock_alloc()
 {
 	struct cblock *cblockp;
@@ -108,7 +108,7 @@ cblock_alloc()
 /*
  * Add a cblock to the cfreelist queue.
  */
-static inline void
+static __inline void
 cblock_free(cblockp)
 	struct cblock *cblockp;
 {
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index ea0f603..914f48f 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $Id: vfs_bio.c,v 1.159 1998/03/19 22:48:12 dyson Exp $
+ * $Id: vfs_bio.c,v 1.160 1998/03/27 06:48:24 dyson Exp $
  */
 
 /*
@@ -422,7 +422,7 @@ bwrite(struct buf * bp)
 	return (0);
 }
 
-inline void
+__inline void
 vfs_bio_need_satisfy(void) {
 	++numfreebuffers;
 	if (!needsbuffer)