diff options
| author | sam <sam@FreeBSD.org> | 2004-04-05 22:10:26 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2004-04-05 22:10:26 +0000 |
| commit | 95fbaa6dadddda9a02cd2dc9ab2d91b38782e790 (patch) | |
| tree | 621357753b20f800f73a5af877383aeeca83161d /sys | |
| parent | 2588e5ad7af384b20a9acae84814c857640b02df (diff) | |
| download | FreeBSD-src-95fbaa6dadddda9a02cd2dc9ab2d91b38782e790.zip FreeBSD-src-95fbaa6dadddda9a02cd2dc9ab2d91b38782e790.tar.gz | |
eliminate nested include by making MALLOC_DECLARE conditional on the
inclusion of <sys/malloc.h>
Submitted by: bde
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net80211/ieee80211_node.h | 2 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_var.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index b62bcde..dfb8d4e 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -128,7 +128,9 @@ ieee80211_unref_node(struct ieee80211_node **ni) struct ieee80211com; +#ifdef MALLOC_DECLARE MALLOC_DECLARE(M_80211_NODE); +#endif extern void ieee80211_node_attach(struct ifnet *); extern void ieee80211_node_lateattach(struct ifnet *); diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index fbcaa7f2..c5ef197 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -37,7 +37,6 @@ /* * Definitions for IEEE 802.11 drivers. */ -#include <sys/malloc.h> #include <net80211/ieee80211.h> #include <net80211/ieee80211_crypto.h> |
