From 5d108eec02c26dcf1158f3cc0cf2746fbf076c19 Mon Sep 17 00:00:00 2001
From: aschwinn <al.schwinn@gsi.de>
Date: Fri, 21 Jul 2017 16:01:32 +0200
Subject: [PATCH] [SIL-215] Build silecs-communication library against SNAP-7
 3rd-party

---
 .../interface/communication/CNVConnection.cpp                | 1 +
 .../interface/communication/CNVConnection.h                  | 2 --
 .../interface/communication/MBConnection.cpp                 | 1 +
 .../interface/communication/MBConnection.h                   | 2 +-
 .../interface/communication/SNAP7Connection.cpp              | 1 +
 .../interface/communication/SNAP7Connection.h                | 1 -
 .../interface/communication/SilecsConnection.h               | 1 -
 .../silecs-communication/interface/core/PLCRecvAction.cpp    | 1 +
 .../silecs-communication/interface/core/PLCSendAction.cpp    | 1 +
 .../silecs-communication/interface/equipment/CNVRegister.h   | 1 -
 .../silecs-communication/interface/equipment/PLCRegister.cpp | 2 ++
 .../silecs-communication/interface/equipment/PLCRegister.h   | 1 -
 .../interface/equipment/SilecsCluster.cpp                    | 3 ++-
 .../src/silecs-communication/protocol/core/silecs.h          | 5 -----
 14 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.cpp b/silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.cpp
index f807d5d..be6ca90 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.h b/silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.h
index c864b30..e161cea 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/CNVConnection.h
+++ b/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>
 
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.cpp b/silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.cpp
index 1711dfe..c27259e 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.h b/silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.h
index 9ea7f9c..fd67d2d 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/MBConnection.h
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.cpp b/silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.cpp
index 277098c..0981707 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.h b/silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.h
index 9ff8ba4..6bb7ee1 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/SNAP7Connection.h
+++ b/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>
 
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/communication/SilecsConnection.h b/silecs-communication-cpp/src/silecs-communication/interface/communication/SilecsConnection.h
index 3c6d04c..b3e7687 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/communication/SilecsConnection.h
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/core/PLCRecvAction.cpp b/silecs-communication-cpp/src/silecs-communication/interface/core/PLCRecvAction.cpp
index 1171ae9..3bf18c7 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/core/PLCRecvAction.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/core/PLCSendAction.cpp b/silecs-communication-cpp/src/silecs-communication/interface/core/PLCSendAction.cpp
index ff07954..2c9a9f9 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/core/PLCSendAction.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/equipment/CNVRegister.h b/silecs-communication-cpp/src/silecs-communication/interface/equipment/CNVRegister.h
index 5e8df44..d17a54d 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/equipment/CNVRegister.h
+++ b/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" {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.cpp b/silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.cpp
index e94d795..de39865 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.h b/silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.h
index 86dc939..ab2d52f 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/equipment/PLCRegister.h
+++ b/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>
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsCluster.cpp b/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsCluster.cpp
index fee499e..fab5864 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsCluster.cpp
+++ b/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
 {
diff --git a/silecs-communication-cpp/src/silecs-communication/protocol/core/silecs.h b/silecs-communication-cpp/src/silecs-communication/protocol/core/silecs.h
index 2edf5b1..34ecce7 100644
--- a/silecs-communication-cpp/src/silecs-communication/protocol/core/silecs.h
+++ b/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
-- 
GitLab