Fix include paths to not confuse local files with system files (json/…

…json.h) (#3669)
domoticz · Oct 17, 2019 · 23f6928 · 23f6928
1 parent 181894b
commit 23f6928
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/hardware/1Wire/1WireForWindows.cpp b/hardware/1Wire/1WireForWindows.cpp
@@ -4,7 +4,7 @@
 #include "1WireForWindows.h"
 #include "../../main/Logger.h"
 #include <boost/optional.hpp>
-#include "../json/json.h"
+#include "../../json/json.h"
 #include <WS2tcpip.h>
 
 #define _1WIRE_SERVICE_PORT "1664"

diff --git a/hardware/plugins/PluginManager.cpp b/hardware/plugins/PluginManager.cpp
@@ -14,14 +14,14 @@
 #include "PluginMessages.h"
 #include "PluginTransports.h"
 
-#include "../main/Helper.h"
-#include "../main/Logger.h"
-#include "../main/SQLHelper.h"
-#include "../main/WebServer.h"
-#include "../main/mainworker.h"
-#include "../main/EventSystem.h"
-#include "../json/json.h"
-#include "../main/localtime_r.h"
+#include "../../main/Helper.h"
+#include "../../main/Logger.h"
+#include "../../main/SQLHelper.h"
+#include "../../main/WebServer.h"
+#include "../../main/mainworker.h"
+#include "../../main/EventSystem.h"
+#include "../../json/json.h"
+#include "../../main/localtime_r.h"
 #ifdef WIN32
 #	include <direct.h>
 #else

diff --git a/hardware/plugins/PluginProtocols.cpp b/hardware/plugins/PluginProtocols.cpp
@@ -7,12 +7,12 @@
 
 #include "PluginMessages.h"
 #include "PluginProtocols.h"
-#include "../main/Helper.h"
-#include "../main/Logger.h"
-#include "../webserver/Base64.h"
+#include "../../main/Helper.h"
+#include "../../main/Logger.h"
+#include "../../webserver/Base64.h"
 #include "icmp_header.hpp"
 #include "ipv4_header.hpp"
-#include "../json/json.h"
+#include "../../json/json.h"
 
 namespace Plugins {