On the off chance that something that is NOT the kernel includes those

files...

3 files changed, 25 insertions, 25 deletions

diff --git a/sys/dev/eisa/eisavar.h b/sys/dev/eisa/eisavar.h
index bf68c40d9fb..9451b2c30be 100644
--- a/sys/dev/eisa/eisavar.h
+++ b/sys/dev/eisa/eisavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisavar.h,v 1.9 1998/10/29 22:45:30 mickey Exp $	*/
+/*	$OpenBSD: eisavar.h,v 1.10 1999/06/16 14:38:35 espie Exp $	*/
 /*	$NetBSD: eisavar.h,v 1.11 1997/06/06 23:30:07 thorpej Exp $	*/
 
 /*
@@ -54,19 +54,19 @@ struct eisabus_attach_args;
 /*
  * Machine-dependent definitions.
  */
-#if (alpha + i386 + arc + hppa != 1)
+#if (__alpha__ + __i386__ + __arc__ + __hppa__ != 1)
 ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #endif
-#if alpha
+#if __alpha__
 #include <alpha/eisa/eisa_machdep.h>
 #endif
-#if i386
+#if __i386__
 #include <i386/eisa/eisa_machdep.h>
 #endif
-#if arc
+#if __arc__
 #include <arc/eisa/eisa_machdep.h>
 #endif
-#if hppa
+#if __hppa__
 #include <hppa/eisa/eisa_machdep.h>
 #endif
 
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index a3c807842dd..0e29d212e78 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isavar.h,v 1.34 1999/01/20 18:21:00 niklas Exp $	*/
+/*	$OpenBSD: isavar.h,v 1.35 1999/06/16 14:38:35 espie Exp $	*/
 /*	$NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $	*/
 
 /*-
@@ -122,28 +122,28 @@
  */
 struct isabus_attach_args;
 
-#if (alpha + amiga + i386 + arc + wgrisc + powerpc + hppa != 1)
+#if (__alpha__ + __amiga__ + __i386__ + __arc__ + __wgrisc__ + __powerpc__ + __hppa__ != 1)
 #error "COMPILING ISA FOR UNSUPPORTED MACHINE, OR MORE THAN ONE."
 #endif
-#ifdef alpha
+#ifdef __alpha__
 #include <alpha/isa/isa_machdep.h>
 #endif
-#ifdef amiga
+#ifdef __amiga__
 #include <amiga/isa/isa_machdep.h>
 #endif
-#ifdef i386
+#ifdef __i386__
 #include <i386/isa/isa_machdep.h>
 #endif
-#ifdef arc
+#ifdef __arc__
 #include <arc/isa/isa_machdep.h>
 #endif
-#ifdef wgrisc
+#ifdef __wgrisc__
 #include <wgrisc/isa/isa_machdep.h>
 #endif
-#ifdef powerpc
+#ifdef __powerpc__
 #include <powerpc/isa/isa_machdep.h>
 #endif
-#ifdef hppa
+#ifdef __hppa__
 #include <hppa/isa/isa_machdep.h>
 #endif
 
@@ -155,10 +155,10 @@ struct isabus_attach_args;
  */
 struct isapnp_softc;
 
-#if (i386 != 1)
+#if (__i386__ != 1)
 ERROR: COMPILING ISAPNP FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #endif
-#if i386
+#if __i386__
 #include <i386/isa/isapnp_machdep.h>
 #endif
 #endif	/* NISAPNP */
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index f55be98384e..e54214335bb 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcivar.h,v 1.14 1999/02/01 16:35:49 pefo Exp $	*/
+/*	$OpenBSD: pcivar.h,v 1.15 1999/06/16 14:38:36 espie Exp $	*/
 /*	$NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $	*/
 
 /*
@@ -54,25 +54,25 @@ struct pcibus_attach_args;
 /*
  * Machine-dependent definitions.
  */
-#if (alpha + atari + i386 + arc + powerpc + galileo != 1)
+#if (__alpha__ + __atari__ + __i386__ + __arc__ + __powerpc__ + __galileo__ != 1)
 ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
 #endif
-#if alpha
+#if __alpha__
 #include <alpha/pci/pci_machdep.h>
 #endif
-#if atari
+#if __atari__
 #include <atari/pci/pci_machdep.h>
 #endif
-#if i386
+#if __i386__
 #include <i386/pci/pci_machdep.h>
 #endif
-#if arc
+#if __arc__
 #include <arc/pci/pci_machdep.h>
 #endif
-#if powerpc
+#if __powerpc__
 #include <powerpc/pci/pci_machdep.h>
 #endif
-#if galileo
+#if __galileo__
 #include <galileo/pci/pci_machdep.h>
 #endif