riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc_mac: fix header includes

Browse Source 
The inclusion of `net/gnrc.h` in `net/gnrc/mac/types.h` header makes it
impossible to include the `net/gnrc/netif.h` header within
`net/gnrc/netif/hdr.h`, due to `net/gnrc/mac/types.h` being included
with `net/gnrc/netif/mac.h` (which is included in `net/gnrc/netif.h`)
This commit is contained in:
Martine Lenders 2018-11-29 10:29:59 +01:00
parent fdde802bd7
commit 9d6a32b551
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/include/net/gnrc/gomach/types.h
View File

@ -24,7 +24,6 @@
#include "kernel_types.h" #include "kernel_types.h"
#include "xtimer.h" #include "xtimer.h"
#include "net/gnrc.h"
#include "net/gnrc/gomach/hdr.h" #include "net/gnrc/gomach/hdr.h"
#ifdef __cplusplus #ifdef __cplusplus

2
sys/include/net/gnrc/mac/types.h
View File

@ -25,7 +25,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "kernel_types.h" #include "kernel_types.h"
#include "net/gnrc.h" #include "net/gnrc/pkt.h"
#include "net/gnrc/priority_pktqueue.h" #include "net/gnrc/priority_pktqueue.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
#include "net/gnrc/mac/mac.h" #include "net/gnrc/mac/mac.h"

1
sys/net/gnrc/link_layer/lwmac/lwmac.c
View File

@ -29,6 +29,7 @@
#include "random.h" #include "random.h"
#include "periph/rtt.h" #include "periph/rtt.h"
#include "net/gnrc/netif.h" #include "net/gnrc/netif.h"
#include "net/gnrc/netif/hdr.h"
#include "net/gnrc/netif/internal.h" #include "net/gnrc/netif/internal.h"
#include "net/gnrc/netif/ieee802154.h" #include "net/gnrc/netif/ieee802154.h"
#include "net/netdev/ieee802154.h" #include "net/netdev/ieee802154.h"

3
tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.c
View File

@ -15,7 +15,8 @@
#include "embUnit.h" #include "embUnit.h"
#include "net/gnrc/pkt.h" #include "net/gnrc/pktbuf.h"
#include "net/gnrc/netif/hdr.h"
#include "net/gnrc/mac/internal.h" #include "net/gnrc/mac/internal.h"
#include "unittests-constants.h" #include "unittests-constants.h"