diff options
| author | alfred <alfred@FreeBSD.org> | 2002-05-30 07:13:40 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-05-30 07:13:40 +0000 |
| commit | cf295fd4a0f6a67861dc0809060376d1d1bf7fb7 (patch) | |
| tree | 249ed7c55968b92b4b8740ed5f8bda1a8b2f1cf0 | |
| parent | 166dc2c9af70098cd040f01a42ba83298b224847 (diff) | |
| download | FreeBSD-src-cf295fd4a0f6a67861dc0809060376d1d1bf7fb7.zip FreeBSD-src-cf295fd4a0f6a67861dc0809060376d1d1bf7fb7.tar.gz | |
Check for defined(__i386__) instead of just defined(i386) since the compiler
will be updated to only define(__i386__) for ANSI cleanliness.
| -rw-r--r-- | sys/dev/joy/joy.c | 4 | ||||
| -rw-r--r-- | sys/dev/nsp/nspvar.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 967e6bd..4580c6a 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 1d331b1..db8e4a8 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_ */ |
