From 747d58ad84d230f6cf11ac818bab65019df83611 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 22 Feb 2017 11:44:27 +0100 Subject: No more warning about not defined functions because of wrong header files inclusion. Some variables are now accessible using functions rather than using global variables that can not be accessed through separated files. Also fix timer returning function type. Change-Id: I36138ff671c2537f595235273abaa34783be18e1 Signed-off-by: Romain Forlot --- src/openxc-utils.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/openxc-utils.cpp') diff --git a/src/openxc-utils.cpp b/src/openxc-utils.cpp index 5f001d41..cef86811 100644 --- a/src/openxc-utils.cpp +++ b/src/openxc-utils.cpp @@ -16,11 +16,6 @@ * limitations under the License. */ -#include -#include -#include - -#include "openxc.pb.h" #include "openxc-utils.hpp" openxc_VehicleMessage build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type type, const openxc_SimpleMessage& message) @@ -115,6 +110,9 @@ openxc_SimpleMessage get_simple_message(const openxc_VehicleMessage& v_msg) { if (v_msg.has_simple_message) return v_msg.simple_message; + + openxc_SimpleMessage s_msg = { true, "", false, build_DynamicField(false), false, build_DynamicField(false)}; + return s_msg; } json_object* jsonify_simple(const openxc_SimpleMessage& s_msg) -- cgit 1.2.3-korg