Page MenuHomeFreeBSD

Fix gcc build
ClosedPublic

Authored by lwhsu on Wed, Jun 12, 1:30 PM.

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
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lwhsu created this revision.Wed, Jun 12, 1:30 PM
imp accepted this revision.Wed, Jun 12, 9:52 PM

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

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