the wi_ieee.h file is in dev/ic/wi_ieee.h in -current

This commit is contained in:
lukem 2001-07-30 06:42:52 +00:00
parent cb3a5c9daf
commit abd0c6a9ae
2 changed files with 88 additions and 1 deletions

View file

@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.2 2001/04/21 11:23:16 wiz Exp $
$NetBSD: distinfo,v 1.3 2001/07/30 06:42:52 lukem Exp $
SHA1 (gtk_wicontrol-0.16.tar.gz) = 8cee862198288f07412c08a4ceb3c7878d4bedcf
Size (gtk_wicontrol-0.16.tar.gz) = 116401 bytes
SHA1 (patch-aa) = de30273b805bd016057225e88567df62f478075a
SHA1 (patch-ab) = 5051bb4bad557707a6d1717d59a7f3040734c8e2
SHA1 (patch-ac) = c6d523dcfdf08cb1168ff98b34fde426ee00c4e1
SHA1 (patch-ad) = e591a6a2b6600a06f7ba17e7589c57de2b210042

View file

@ -0,0 +1,86 @@
--- ./config.h.in- Mon Dec 18 04:53:05 2000
+++ ./config.h.in Mon Jul 30 15:13:24 2001
@@ -104,6 +104,9 @@
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
+/* Define if you have the <dev/ic/wi_ieee.h> header file. */
+#undef HAVE_DEV_IC_WI_IEEE_H
+
/* Define if you have the <dev/pcmcia/if_wi_ieee.h> header file. */
#undef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
--- ./configure.in- Tue Mar 6 13:55:59 2001
+++ ./configure.in Mon Jul 30 15:08:21 2001
@@ -13,7 +13,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
AC_CHECK_HEADER(net/if_var.h)
AC_CHECK_HEADERS(net/if_ether.h net/ethernet.h)
-AC_CHECK_HEADERS(dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h)
+AC_CHECK_HEADERS(dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h dev/ic/wi_ieee.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
--- ./src/callbacks.c- Tue Mar 6 13:52:38 2001
+++ ./src/callbacks.c Mon Jul 30 15:14:33 2001
@@ -28,12 +28,12 @@
#endif
#endif
-#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
+#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
#include <dev/pcmcia/if_wi_ieee.h>
-#else
-#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
+#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
#include <machine/if_wavelan_ieee.h>
-#endif
+#elif defined(HAVE_DEV_IC_WI_IEEE_H)
+#include <dev/ic/wi_ieee.h>
#endif
#include "callbacks.h"
--- ./src/main.c- Sat Dec 2 13:49:05 2000
+++ ./src/main.c Mon Jul 30 15:14:41 2001
@@ -27,13 +27,13 @@
#include <net/ethernet.h>
#endif
#endif
-
-#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
+
+#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
#include <dev/pcmcia/if_wi_ieee.h>
-#else
-#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
-#include <machine/if_wavelan_ieee.h>
-#endif
+#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
+#include <machine/if_wavelan_ieee.h>
+#elif defined(HAVE_DEV_IC_WI_IEEE_H)
+#include <dev/ic/wi_ieee.h>
#endif
#include "interface.h"
--- ./src/wiinfo.c- Sat Dec 2 13:08:45 2000
+++ ./src/wiinfo.c Mon Jul 30 15:14:45 2001
@@ -28,12 +28,12 @@
#endif
#endif
-#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
+#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
#include <dev/pcmcia/if_wi_ieee.h>
-#else
-#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
+#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
#include <machine/if_wavelan_ieee.h>
-#endif
+#elif defined(HAVE_DEV_IC_WI_IEEE_H)
+#include <dev/ic/wi_ieee.h>
#endif
void