From bc295a57aa21a286e1bedbbc7c815c727bc529ab Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 2 Oct 2024 09:33:42 +0000 Subject: [PATCH] Merge branch 'Fix-19' into 'master' Fix #19: directly include soe_error_codes into SoeCommand.cpp Closes #19 See merge request etherlab.org/ethercat!39 (cherry picked from commit 45f2d1a988c21cc7e7b8b0be53b6548535999245) e30a39f3 Fix #19: directly include soe_error_codes into SoeCommand.cpp Co-authored-by: Florian Pose --- tool/Makefile.am | 1 - tool/SoeCommand.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tool/Makefile.am b/tool/Makefile.am index 27bce15c..a4656a87 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -28,7 +28,6 @@ EXTRA_DIST = bin_PROGRAMS = ethercat ethercat_SOURCES = \ - ../master/soe_errors.c \ Command.cpp \ CommandAlias.cpp \ CommandCrc.cpp \ diff --git a/tool/SoeCommand.cpp b/tool/SoeCommand.cpp index 67cb0792..278dba7c 100644 --- a/tool/SoeCommand.cpp +++ b/tool/SoeCommand.cpp @@ -23,8 +23,7 @@ using namespace std; #include "SoeCommand.h" - -extern const ec_code_msg_t soe_error_codes[]; +#include "../master/soe_errors.c" /****************************************************************************/