[SIL-215] Build silecs-communication library against SNAP-7 3rd-party

silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.cpp

@@ -24,6 +24,7 @@
 #include <silecs-communication/interface/utility/SilecsException.h>
 #include <silecs-communication/interface/utility/SilecsLog.h>
 #include <silecs-communication/interface/utility/StringUtilities.h>
+#include <silecs-communication/protocol/core/silecs.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.h

@@ -19,8 +19,6 @@
 
 #include <silecs-communication/interface/communication/SilecsConnection.h>
 
-#include <silecs-communication/protocol/core/silecs.h>
-
 #include <iostream>
 #include <string.h>
 

silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.cpp

@@ -19,6 +19,7 @@
 #include <silecs-communication/interface/equipment/SilecsPLC.h>
 #include <silecs-communication/interface/communication/MBConnection.h>
 #include <silecs-communication/interface/utility/SilecsException.h>
+#include <silecs-communication/protocol/modbus/iemdb.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.h

@@ -17,7 +17,7 @@
 #define _MB_CONNECTION_H_
 
 #include <silecs-communication/interface/communication/SilecsConnection.h>
-#include <silecs-communication/protocol/core/silecs.h>
+#include <modbus.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.cpp

@@ -19,6 +19,7 @@
 #include <silecs-communication/interface/equipment/SilecsPLC.h>
 #include <silecs-communication/interface/communication/SNAP7Connection.h>
 #include <silecs-communication/interface/utility/SilecsException.h>
+#include <silecs-communication/protocol/core/silecs.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.h

@@ -16,7 +16,6 @@
 #ifndef _SNAP7_CONNECTION_H_
 #define _SNAP7_CONNECTION_H_
 
-#include <silecs-communication/protocol/core/silecs.h>
 #include <silecs-communication/interface/communication/SilecsConnection.h>
 #include <snap7.h>
 

silecs-communication-cpp/src/silecs-communication/interface/communication/SilecsConnection.h

@@ -19,7 +19,6 @@
 #include <silecs-communication/interface/core/SilecsService.h>
 #include <silecs-communication/interface/utility/Mutex.h>
 #include <silecs-communication/interface/utility/TimeStamp.h>
-#include <silecs-communication/protocol/core/silecs.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/core/PLCRecvAction.cpp

@@ -23,6 +23,7 @@
 #include <silecs-communication/interface/equipment/PLCBlock.h>
 #include <silecs-communication/interface/core/Context.h>
 #include <silecs-communication/interface/utility/SilecsLog.h>
+#include <silecs-communication/protocol/core/silecs.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/core/PLCSendAction.cpp

@@ -24,6 +24,7 @@
 #include <silecs-communication/interface/equipment/PLCBlock.h>
 #include <silecs-communication/interface/core/Context.h>
 #include <silecs-communication/interface/utility/SilecsLog.h>
+#include <silecs-communication/protocol/core/silecs.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/equipment/CNVRegister.h

@@ -25,7 +25,6 @@
 #include <silecs-communication/interface/utility/SilecsException.h>
 #include <silecs-communication/interface/utility/SilecsLog.h>
 #include <silecs-communication/interface/utility/StringUtilities.h>
-#include <silecs-communication/protocol/core/silecs.h>
 
 #ifdef __cplusplus
 extern "C" {

silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.cpp

@@ -14,6 +14,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "PLCRegister.h"
+#include <silecs-communication/protocol/core/silecs.h>
+#include <silecs-communication/protocol/modbus/iemdb.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.h

@@ -24,7 +24,6 @@
 #include <silecs-communication/interface/utility/SilecsException.h>
 #include <silecs-communication/interface/utility/SilecsLog.h>
 #include <silecs-communication/interface/utility/StringUtilities.h>
-#include <silecs-communication/protocol/core/silecs.h>
 
 #ifdef __x86_64__
 #include <endian.h>

silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsCluster.cpp

@@ -19,7 +19,8 @@
 #include <silecs-communication/interface/equipment/SilecsBlock.h>
 #include <silecs-communication/interface/utility/SilecsException.h>
 #include <silecs-communication/interface/utility/SilecsLog.h>
-#include <silecs-communication/protocol/core/silecs.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 
 namespace Silecs
 {

silecs-communication-cpp/src/silecs-communication/protocol/core/silecs.h

@@ -38,11 +38,6 @@
 /* ---------------------------------------------------------*/
 #include "ietype.h"
 
-/* ---------------------------------------------------------*/
-/* PROTOTYPE DEFINITIONS                                    */
-/* ---------------------------------------------------------*/
-#include <silecs-communication/protocol/modbus/iemdb.h>
-
 /*----------------------------------------------------------*/
 /* Time funtion
  * IeRfcSetTime: Convert time_t epoch date to PLC _DT format