Page MenuHomeFreeBSD

Fix gcc build
ClosedPublic

Authored by lwhsu on Jun 12 2019, 1:30 PM.
Tags
None
Referenced Files
F136967114: D20622.id58562.diff
Thu, Nov 20, 8:58 PM
F136967035: D20622.id58579.diff
Thu, Nov 20, 8:57 PM
F136966969: D20622.id.diff
Thu, Nov 20, 8:57 PM
F136964928: D20622.diff
Thu, Nov 20, 8:49 PM
Unknown Object (File)
Tue, Nov 18, 7:44 PM
Unknown Object (File)
Thu, Nov 6, 3:59 AM
Unknown Object (File)
Thu, Nov 6, 2:35 AM
Unknown Object (File)
Mon, Nov 3, 4:17 AM
Subscribers

Details

Summary

Fix gcc build

https://ci.freebsd.org/job/FreeBSD-head-amd64-gcc/10338/console :

In file included from /workspace/src/stand/efi/boot1/boot1.c:34:0:
/workspace/src/stand/efi/boot1/boot_module.h:112:12: error: redundant redeclaration of 'vsnprintf' [-Werror=redundant-decls]
 extern int vsnprintf(char *str, size_t sz, const char *fmt, va_list ap);
            ^~~~~~~~~
In file included from /workspace/src/stand/efi/boot1/boot1.c:28:0:
/workspace/src/stand/libsa/stand.h:276:12: note: previous declaration of 'vsnprintf' was here
 extern int vsnprintf(char *buf, size_t size, const char *cfmt, __va_list);
            ^~~~~~~~~

I see most files already include stand.h so I suspect we can remove redeclaration in boot_module.h (or have a #ifndef guard?)

Test Plan

make CROSS_TOOLCHAIN=amd64-gcc buildworld buildkernel

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 24830
Build 23582: arc lint + arc unit

Event Timeline

yea, this never should have been in boot_module.h to start with.

This revision is now accepted and ready to land.Jun 12 2019, 9:52 PM
This revision was automatically updated to reflect the committed changes.