1*4882a593SmuzhiyunFrom 08467411d7dfc2a2b7ede62e5fdc640748ea1db2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 9 Sep 2020 19:14:52 +0200 4*4882a593SmuzhiyunSubject: [PATCH] lib/neardal.h: fix build with gcc 10 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDefine neardal_output_cb as extern to avoid the following build failure 7*4882a593Smuzhiyunwith gcc 10 (which defaults to -fno-common): 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun/srv/storage/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: ./.libs/neardal_adapter.o:(.bss+0x0): multiple definition of `neardal_output_cb'; ./.libs/neardal.o:(.bss+0x68): first defined here 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunFixes: 12*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/7efb100c899b67ffd570f73c202442f95ca5397e 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15*4882a593Smuzhiyun[Upstream status: https://github.com/connectivity/neardal/pull/10] 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun lib/neardal.h | 2 +- 18*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/lib/neardal.h b/lib/neardal.h 21*4882a593Smuzhiyunindex d1cd18b..3e83595 100644 22*4882a593Smuzhiyun--- a/lib/neardal.h 23*4882a593Smuzhiyun+++ b/lib/neardal.h 24*4882a593Smuzhiyun@@ -638,7 +638,7 @@ neardal_record *neardal_g_variant_to_record(GVariant *in); 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun void neardal_trace(const char *func, FILE *fp, char *fmt, ...) 27*4882a593Smuzhiyun __attribute__((format(printf, 3, 4))); 28*4882a593Smuzhiyun-int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap); 29*4882a593Smuzhiyun+extern int (*neardal_output_cb)(FILE *fp, const char *fmt, va_list ap); 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun #ifdef __cplusplus 32*4882a593Smuzhiyun } 33*4882a593Smuzhiyun-- 34*4882a593Smuzhiyun2.28.0 35*4882a593Smuzhiyun 36