mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
cc06227463
This patch fixes the following error when we compile with GCC 10. ‘’ ‘’openwrt/staging_dir/toolchain-aarch64_generic_gcc-10.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/10.2.0/../../../../aarch64-openwrt-linux-musl/bin/ld: ss_local-http.o:openwrt/build_dir/target-aarch64_generic_musl/shadowsocksr-libev/shadowsocksr-libev-2.5.6-d63ff863800a5645aca4309d5dd5962bd1e95543/src/http.h:32: multiple definition of `http_protocol'; ss_local-local.o:openwrt/build_dir/target-aarch64_generic_musl/shadowsocksr-libev/shadowsocksr-libev-2.5.6-d63ff863800a5645aca4309d5dd5962bd1e95543/src/http.h:32: first defined here openwrt/staging_dir/toolchain-aarch64_generic_gcc-10.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/10.2.0/../../../../aarch64-openwrt-linux-musl/bin/ld: ss_local-tls.o:openwrt/build_dir/target-aarch64_generic_musl/shadowsocksr-libev/shadowsocksr-libev-2.5.6-d63ff863800a5645aca4309d5dd5962bd1e95543/src/tls.h:31: multiple definition of `tls_protocol'; ss_local-local.o:openwrt/build_dir/target-aarch64_generic_musl/shadowsocksr-libev/shadowsocksr-libev-2.5.6-d63ff863800a5645aca4309d5dd5962bd1e95543/src/tls.h:31: first defined here‘’ ‘’
25 lines
498 B
Diff
25 lines
498 B
Diff
diff --git a/src/http.h b/src/http.h
|
|
index 914815a..e312dd3 100644
|
|
--- a/src/http.h
|
|
+++ b/src/http.h
|
|
@@ -29,6 +29,6 @@
|
|
#include <stdio.h>
|
|
#include "protocol.h"
|
|
|
|
-const protocol_t *const http_protocol;
|
|
+extern const protocol_t *const http_protocol;
|
|
|
|
#endif
|
|
diff --git a/src/tls.h b/src/tls.h
|
|
index 3998913..ddbee11 100644
|
|
--- a/src/tls.h
|
|
+++ b/src/tls.h
|
|
@@ -28,6 +28,6 @@
|
|
|
|
#include "protocol.h"
|
|
|
|
-const protocol_t *const tls_protocol;
|
|
+extern const protocol_t *const tls_protocol;
|
|
|
|
#endif
|