From 8cc758355d51920adb7dc5b5899cf5fdca9fbd74 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 8 Feb 2018 22:06:25 +0100 Subject: Enable use of system-wide asio, glm and rapidjson (#3172) * Fixed building using system utf8proc * Fixed building using system portaudio * Allow using system-wide asio headers (1.11.0 or higher required). * Allow using system-wide glm headers * Allow using system-wide rapidjson headers --- src/lib/util/client_https.hpp | 2 +- src/lib/util/client_wss.hpp | 2 +- src/lib/util/server_http_impl.hpp | 2 +- src/lib/util/server_https.hpp | 2 +- src/lib/util/server_ws_impl.hpp | 2 +- src/lib/util/server_wss.hpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/util/client_https.hpp b/src/lib/util/client_https.hpp index 3300ea6865f..835a7ee613d 100644 --- a/src/lib/util/client_https.hpp +++ b/src/lib/util/client_https.hpp @@ -4,7 +4,7 @@ #define CLIENT_HTTPS_HPP #include "client_http.hpp" -#include "asio/ssl.hpp" +#include namespace webpp { using HTTPS = asio::ssl::stream; diff --git a/src/lib/util/client_wss.hpp b/src/lib/util/client_wss.hpp index ef30b459607..6ff51658f30 100644 --- a/src/lib/util/client_wss.hpp +++ b/src/lib/util/client_wss.hpp @@ -4,7 +4,7 @@ #define CLIENT_WSS_HPP #include "client_ws.hpp" -#include "asio/ssl.hpp" +#include namespace webpp { using WSS = asio::ssl::stream; diff --git a/src/lib/util/server_http_impl.hpp b/src/lib/util/server_http_impl.hpp index 4f909c023ef..e949e6b2483 100644 --- a/src/lib/util/server_http_impl.hpp +++ b/src/lib/util/server_http_impl.hpp @@ -9,7 +9,7 @@ #include "server_http.hpp" #include "asio.h" -#include "asio/system_timer.hpp" +#include #include "path_to_regex.hpp" #include diff --git a/src/lib/util/server_https.hpp b/src/lib/util/server_https.hpp index e721cbb3e25..d76aa377762 100644 --- a/src/lib/util/server_https.hpp +++ b/src/lib/util/server_https.hpp @@ -4,7 +4,7 @@ #define SERVER_HTTPS_HPP #include "server_http.hpp" -#include "asio/ssl.hpp" +#include #include #include diff --git a/src/lib/util/server_ws_impl.hpp b/src/lib/util/server_ws_impl.hpp index cbb6f9b4908..9fc5876cab2 100644 --- a/src/lib/util/server_ws_impl.hpp +++ b/src/lib/util/server_ws_impl.hpp @@ -6,7 +6,7 @@ #include "crypto.hpp" #include "asio.h" -#include "asio/system_timer.hpp" +#include #include "server_ws.hpp" #include diff --git a/src/lib/util/server_wss.hpp b/src/lib/util/server_wss.hpp index ecf46fb1524..ea0bc47626e 100644 --- a/src/lib/util/server_wss.hpp +++ b/src/lib/util/server_wss.hpp @@ -4,7 +4,7 @@ #define SERVER_WSS_HPP #include "server_ws.hpp" -#include "asio/ssl.hpp" +#include #include #include -- cgit v1.2.3