From: Romain Forlot Date: Wed, 8 Mar 2017 21:59:04 +0000 (+0100) Subject: Move "config" variable as global. X-Git-Tag: 5.0.2~536 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=1ed2a620b5ac6272de01be7f1830715f7f0d280d;p=apps%2Fagl-service-can-low-level.git Move "config" variable as global. Change-Id: I1760dce5ef5836c9392837f4a196382ee88dabd8 Signed-off-by: Romain Forlot Conflicts: src/configuration.hpp --- diff --git a/src/configuration.hpp b/src/configuration.hpp index 823d8864..77f452ff 100644 --- a/src/configuration.hpp +++ b/src/configuration.hpp @@ -101,3 +101,7 @@ class configuration_t bool isBusActive(can_bus_dev_t* bus); */ }; + +// Make a global variable pointer +extern configuration_t *config; + diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index 759437bc..46dcbf26 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -27,6 +27,7 @@ #include #include "openxc.pb.h" +#include "configuration.hpp" #include "can/can-bus.hpp" #include "can/can-signals.hpp" #include "can/can-message.hpp" diff --git a/src/low-can-binding.hpp b/src/low-can-binding.hpp index 1509c2a6..04c7eac4 100644 --- a/src/low-can-binding.hpp +++ b/src/low-can-binding.hpp @@ -20,8 +20,6 @@ #include -#include "configuration.hpp" - extern "C" { #include @@ -29,6 +27,4 @@ extern "C" extern "C" struct afb_binding_interface; -extern const struct afb_binding_interface *binder_interface; - -extern configuration_t *config; \ No newline at end of file +extern const struct afb_binding_interface *binder_interface; \ No newline at end of file