bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #19: directly include soe_error_codes into SoeCommand.cpp 

Avoid having to rebuild conflicting master/soe_errors.c objects. Inside
the `tool` folder, the `soe_error_codes` array is used only by
SoeCommand, so this should not create further problems.
This commit is contained in:
Nicola Fontana 2021-11-01 20:17:26 +01:00
parent 65285fe74c
commit e30a39f36e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tool/Makefile.am
View File

@ -36,7 +36,6 @@ EXTRA_DIST =
bin_PROGRAMS = ethercat bin_PROGRAMS = ethercat
ethercat_SOURCES = \ ethercat_SOURCES = \
../master/soe_errors.c \
Command.cpp \ Command.cpp \
CommandAlias.cpp \ CommandAlias.cpp \
CommandCrc.cpp \ CommandCrc.cpp \

3
tool/SoeCommand.cpp
View File

@ -31,8 +31,7 @@
using namespace std; using namespace std;
#include "SoeCommand.h" #include "SoeCommand.h"
#include "../master/soe_errors.c"
extern const ec_code_msg_t soe_error_codes[];
/*****************************************************************************/ /*****************************************************************************/