odhcpd: fix compilation with GCC10

GCC10 mandates the C++ one definition rule, which breaks on multiple
definitions of config. Add the appropriate extern declaration.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 26094b1143c4ca18f785969d54648eaa0734b9d1..39e0e5137cf5514555f0ea98420d45bfe284b47d 100644 (file)
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -43,8 +43,6 @@
 #include <libubox/uloop.h>
 #include "odhcpd.h"
 
 #include <libubox/uloop.h>
 #include "odhcpd.h"
 

-
-

 static int ioctl_sock = -1;
 static int urandom_fd = -1;
 
 static int ioctl_sock = -1;
 static int urandom_fd = -1;
 

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 072a148727bb3d9d11a3667ed36afca2aa15294f..09013c4b094b76f1555f6bbe7e951c746821329c 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -44,6 +44,7 @@
 struct interface;
 struct nl_sock;
 extern struct vlist_tree leases;
 struct interface;
 struct nl_sock;
 extern struct vlist_tree leases;

+extern struct config config;

 
 struct odhcpd_event {
        struct uloop_fd uloop;
 
 struct odhcpd_event {
        struct uloop_fd uloop;


@@ -139,7 +140,7 @@ struct config {
        char *dhcp_cb;
        char *dhcp_statefile;
        int log_level;
        char *dhcp_cb;
        char *dhcp_statefile;
        int log_level;

-} config;
+};

 
 
 struct lease {
 
 
 struct lease {