From bace7cd9875a3e11cfb25d948958de7af36f237b Mon Sep 17 00:00:00 2001 From: lotodore Date: Tue, 6 Jan 2015 15:43:24 +0100 Subject: [PATCH] Workaround for issue #282 (should be backward compatible). --- pokerth_server.pro | 3 +++ src/net/common/ircthread.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pokerth_server.pro b/pokerth_server.pro index 1051b646..d62bdb63 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -176,6 +176,9 @@ unix : !mac { LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib INCLUDEPATH += $${PREFIX}/include + # see issue https://github.com/pokerth/pokerth/issues/282 + INCLUDEPATH += $${PREFIX}/include/libircclient + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_THREAD = boost_thread boost_thread-mt diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp index 5b8cad24..9fe57985 100644 --- a/src/net/common/ircthread.cpp +++ b/src/net/common/ircthread.cpp @@ -32,14 +32,14 @@ #include #include #include -#include +#include // We need to do the following to handle different versions of libircclient. // Sadly, libircclient doesn't have actual definitions for its versions in its headers. // However, we can use a definition that appeared in the same version we need // to check for. Hacky, but hey, it works. #ifdef LIBIRC_OPTION_SSL_NO_VERIFY -#include +#include #endif #include