Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix include paths to not confuse local files with system files #3669

Merged
merged 1 commit into from
Oct 17, 2019
Merged

Fix include paths to not confuse local files with system files #3669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hardware/1Wire/1WireForWindows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions hardware/plugins/PluginManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions hardware/plugins/PluginProtocols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down