Merge pull request #110 from bitshares/jmj_zlib

Allow zlib to be optional
This commit is contained in:
John M. Jones 2019-03-04 16:03:25 -05:00 committed by GitHub
commit 6a5ba93fa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6,7 +6,11 @@
#include <websocketpp/client.hpp>
#include <websocketpp/logger/stub.hpp>
#ifdef HAS_ZLIB
#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
#else
#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
#endif
#include <fc/optional.hpp>
#include <fc/variant.hpp>
@ -66,7 +70,11 @@ namespace fc { namespace http {
// permessage_compress extension
struct permessage_deflate_config {};
#ifdef HAS_ZLIB
typedef websocketpp::extensions::permessage_deflate::enabled <permessage_deflate_config> permessage_deflate_type;
#else
typedef websocketpp::extensions::permessage_deflate::disabled <permessage_deflate_config> permessage_deflate_type;
#endif
};
struct asio_tls_with_stub_log : public websocketpp::config::asio_tls {