$OpenBSD: patch-bsd_obsdintr_h,v 1.1 2000/07/17 16:24:47 form Exp $
--- bsd/obsdintr.h.orig	Tue Jan 26 01:32:03 1999
+++ bsd/obsdintr.h	Mon Jul 17 23:02:06 2000
@@ -1,7 +1,17 @@
 #ifndef _OPENBSDINTR_H_
 #define _OPENBSDINTR_H_
 
-#ifdef i386
+/* XXX: gcc defines i386, but egcs defines __i386__ */
+#if defined(i386) && !defined(__i386__)
+#define __i386__
+#endif
+
+/* XXX: gcc defines pc532, but egcs defines __pc532__ */
+#if defined(pc532) && !defined(__pc532__)
+#define __pc532__
+#endif
+
+#ifdef __i386__
 struct intrhand {
 	int	(*ih_fun) __P((void *));
 	void	*ih_arg;
@@ -13,7 +23,7 @@ struct intrhand {
 };
 #endif
 
-#ifdef pc532
+#ifdef __pc532__
 struct iv {
 	void (*iv_vec)();
 	void *iv_arg;