Oops, the previous commit should have changed `i386' to `__i386__',

not `__i386'.

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/i386/isa/sound/audio.c b/sys/i386/isa/sound/audio.c
index 80dc061..b7d25a4 100644
--- a/sys/i386/isa/sound/audio.c
+++ b/sys/i386/isa/sound/audio.c
@@ -57,7 +57,7 @@ static char    *wr_dma_buf[MAX_AUDIO_DEV];
 static int      audio_format[MAX_AUDIO_DEV];
 static int      local_conversion[MAX_AUDIO_DEV];
 
-#if defined(NO_INLINE_ASM) || !defined(__i386)
+#if defined(NO_INLINE_ASM) || !defined(__i386__)
 static void
 translate_bytes(const u_char *table, u_char *buff, int n);
 
@@ -148,7 +148,7 @@ audio_release(int dev, struct fileinfo * file)
 
 }
 
-#if defined(NO_INLINE_ASM) || !defined(__i386)
+#if defined(NO_INLINE_ASM) || !defined(__i386__)
 static void
 translate_bytes(const u_char *table, u_char *buff, int n)
 {
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index f300fa1..2b23ac7 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.12 1998/03/29 11:54:52 phk Exp $
+ * $Id: md5c.c,v 1.13 1998/04/15 17:46:21 bde Exp $
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
@@ -44,10 +44,10 @@
 #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
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index c674c58..80fda30 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.24 1997/11/06 19:29:18 phk Exp $
+ * $Id: subr_prof.c,v 1.25 1998/04/15 17:46:23 bde Exp $
  */
 
 #include <sys/param.h>
@@ -161,7 +161,7 @@ kmstartup(dummy)
 
 	startguprof(p);
 	for (i = 0; i < CALIB_SCALE; i++)
-#if defined(__i386) && __GNUC__ >= 2
+#if defined(__i386__) && __GNUC__ >= 2
 		__asm("pushl %0; call __mcount; popl %%ecx"
 		      :
 		      : "i" (profil)
@@ -173,7 +173,7 @@ kmstartup(dummy)
 
 	startguprof(p);
 	for (i = 0; i < CALIB_SCALE; i++)
-#if defined(__i386) && __GNUC__ >= 2
+#if defined(__i386__) && __GNUC__ >= 2
 		    __asm("call mexitcount; 1:"
 			  : : : "ax", "bx", "cx", "dx", "memory");
 	__asm("movl $1b,%0" : "=rm" (tmp_addr));
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index f3e6495..6042d20 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.33 1998/04/06 11:43:12 phk Exp $ */
+/* $Id: ppp_tty.c,v 1.34 1998/04/15 17:46:46 bde Exp $ */
 
 #include "ppp.h"
 #if NPPP > 0
@@ -98,7 +98,7 @@
 # include <sys/vnode.h>
 #define KERNEL
 
-#ifdef __i386
+#ifdef __i386__
 #include <i386/isa/intr_machdep.h>
 #endif
 
@@ -170,7 +170,7 @@ void
 pppasyncattach(dummy)
     void *dummy;
 {
-#ifdef __i386
+#ifdef __i386__
     int s;
 
     s = splhigh();