Skip to content

sys/gnrc/sixlowpan/frag/fb: guard sfr_types.h header include#17730

Merged
kaspar030 merged 1 commit intoRIOT-OS:masterfrom
fjmolinas:pr_sixlowpan_frag_fb_include_guard
Mar 2, 2022
Merged

sys/gnrc/sixlowpan/frag/fb: guard sfr_types.h header include#17730
kaspar030 merged 1 commit intoRIOT-OS:masterfrom
fjmolinas:pr_sixlowpan_frag_fb_include_guard

Conversation

@fjmolinas
Copy link
Contributor

Contribution description

This guards the header.

Testing procedure

  • green murdock
  • in master the following error showed up if using ztimer_xtimer_compat (no 64bit), which exposed the wrongful inclusion.

USEMODULE=ztimer_xtimer_compat make -C tests/gnrc_sixlowpan_frag -j

In file included from /home/francisco/workspace/RIOT/sys/include/evtimer_msg.h:24,
                 from /home/francisco/workspace/RIOT/sys/include/net/gnrc/sixlowpan/frag/sfr_types.h:25,
                 from /home/francisco/workspace/RIOT/sys/include/net/gnrc/sixlowpan/frag/fb.h:31,
                 from /home/francisco/workspace/RIOT/sys/net/gnrc/network_layer/sixlowpan/frag/fb/gnrc_sixlowpan_frag_fb.c:20:
/home/francisco/workspace/RIOT/sys/include/evtimer.h: In function ‘evtimer_now_msec’:
/home/francisco/workspace/RIOT/sys/include/evtimer.h:134:12: error: implicit declaration of function ‘xtimer_now_usec64’; did you mean ‘xtimer_now_usec’? [-Werror=implicit-function-declaration]
  134 |     return xtimer_now_usec64() / US_PER_MS;
      |            ^~~~~~~~~~~~~~~~~
      |            xtimer_now_usec

Note: the above command still yields an error, but will be fixed in another PR.

Issues/PRs references

Found in #17365

The included header references evtimer which is not a direct
dependency for gnrc_sixlowpan_frag, but only for
gnr_sixlowpan_frag_sfr
@fjmolinas fjmolinas added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Mar 2, 2022
@github-actions github-actions bot added Area: network Area: Networking Area: sys Area: System labels Mar 2, 2022
@fjmolinas fjmolinas requested review from kaspar030 and kfessel March 2, 2022 07:46
Copy link
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.

ACK.

@kaspar030 kaspar030 merged commit 9717401 into RIOT-OS:master Mar 2, 2022
@fjmolinas fjmolinas deleted the pr_sixlowpan_frag_fb_include_guard branch March 2, 2022 13:26
@OlegHahm OlegHahm added this to the Release 2022.04 milestone Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: network Area: Networking Area: sys Area: System CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants