Skip to content

gnrc_mac: fix non-obvious recursive include#8016

Merged
kaspar030 merged 1 commit intoRIOT-OS:gnrc_netif2_integration/masterfrom
miri64:gnrc_mac/fix/recursive-include
Nov 13, 2017
Merged

gnrc_mac: fix non-obvious recursive include#8016
kaspar030 merged 1 commit intoRIOT-OS:gnrc_netif2_integration/masterfrom
miri64:gnrc_mac/fix/recursive-include

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented Nov 13, 2017

net/gnrc/mac/types.h is already included by net/gnrc/netif2.h. Likewise, net/gnrc/mac/types.h is including net/gnrc.h which in turn includes also net/gnrc/netif2.h. This recursive inclusion causes some confusion to the compiler who than in some instances can't find the gnrc_mac types in net/gnrc/netif2.h. This PR takes care of that by removing one redundant include of net/gnrc/mac/types.h.

@miri64 miri64 added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) GNRC Area: network Area: Networking labels Nov 13, 2017
@kaspar030 kaspar030 added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Nov 13, 2017
Copy link
Copy Markdown
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess if it still builds, it works. ACK.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 13, 2017

@kaspar030 just to warn you: Murdock will fail. You have to look at the results of the unittests.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 13, 2017

(The whole gnrc_netif2_integration/master branch currently does not build completely in Murdock, since not all device adaptations are merged yet. BTW: can you have a look at #7419?)

@kaspar030
Copy link
Copy Markdown
Contributor

@kaspar030 just to warn you: Murdock will fail. You have to look at the results of the unittests.

Unittests all built correctly. Go.

@kaspar030 kaspar030 merged commit 2ae5ad8 into RIOT-OS:gnrc_netif2_integration/master Nov 13, 2017
@miri64 miri64 deleted the gnrc_mac/fix/recursive-include branch November 13, 2017 13:38
@aabadie aabadie added this to the Release 2018.01 milestone Jan 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants