summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/joy/joy.c4
-rw-r--r--sys/dev/nsp/nspvar.h6
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_ */
OpenPOWER on IntegriCloud