Add -fno-common to debugging CFLAGS.

Declare udp_dhcp_len as extern.

diff --git a/mk/cc.mk b/mk/cc.mk
index fcf05351625e4db8b452afeb23fa782e42f0f3be..ffbf93a69d74ae8de70bf3968e5aa2809d1a11c1 100644 (file)
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -14,7 +14,8 @@ _CCFLAGS=     -pedantic -Wall -Wunused -Wimplicit -Wshadow -Wformat=2 \
                -Wmissing-declarations -Wno-missing-prototypes -Wwrite-strings \
                -Wbad-function-cast -Wnested-externs -Wcomment -Winline \
                -Wchar-subscripts -Wcast-align -Wno-format-nonliteral \
-               -Wdeclaration-after-statement -Wsequence-point -Wextra
+               -Wdeclaration-after-statement -Wsequence-point -Wextra \
+               -fno-common
 _CC_FLAGS_SH=  if ! test -d .git; then echo ""; else for f in ${_CCFLAGS}; do \
                if ${CC} $$f -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
                then printf "%s" "$$f "; fi \

diff --git a/net.h b/net.h
index 1447aba0beb9aff4bede3d878da8098fcd88b7ba..363cb2a83911ebd40adc9de22c5566ee38c75c75 100644 (file)
--- a/net.h
+++ b/net.h
@@ -156,7 +156,7 @@ int if_route(const struct interface *,
 void free_routes(struct rt *);
 
 int open_udp_socket(struct interface *);
-const size_t udp_dhcp_len;
+extern const size_t udp_dhcp_len;
 ssize_t make_udp_packet(uint8_t **, const uint8_t *, size_t,
                        struct in_addr, struct in_addr);
 ssize_t get_udp_data(const uint8_t **, const uint8_t *);