From 8e5e1ed8744ff6cbd89edfde30e87bfdd82d2e67 Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Thu, 30 May 2002 07:13:40 +0000 Subject: Check for defined(__i386__) instead of just defined(i386) since the compiler will be updated to only define(__i386__) for ANSI cleanliness. --- sys/dev/joy/joy.c | 4 ++-- sys/dev/nsp/nspvar.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 967e6bdbdf06..4580c6a0c53e 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -165,7 +165,7 @@ joyread(dev_t dev, struct uio *uio, int flag) int state = 0; struct timespec x, y; struct joystick c; -#ifndef i386 +#ifndef __i386__ int s; s = splhigh(); @@ -192,7 +192,7 @@ joyread(dev_t dev, struct uio *uio, int flag) if (timespecisset(&x) && timespecisset(&y)) break; } -#ifndef i386 +#ifndef __i386__ splx(s); #else enable_intr (); diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h index 1d331b1d3b66..db8e4a8cffef 100644 --- a/sys/dev/nsp/nspvar.h +++ b/sys/dev/nsp/nspvar.h @@ -105,9 +105,9 @@ void nspattachsubr(struct nsp_softc *); int nspprint(void *, const char *); int nspintr(void *); -#if defined(i386) +#if defined(__i386__) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) -#else /* !i386 */ +#else /* !__i386__ */ #define SOFT_INTR_REQUIRED(slp) -#endif /* !i386 */ +#endif /* !__i386__ */ #endif /* !_NSPVAR_H_ */ -- cgit v1.3