[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/LOOLWSD.cpp

Jan Holesovsky kendy at collabora.com
Wed Mar 14 15:05:16 UTC 2018


 wsd/LOOLWSD.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a3509d0b5c51c17944628702a0717d6933385f6
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Mar 14 15:54:15 2018 +0100

    Fix build without a support key.
    
    Change-Id: I0900b29d936934b0dc0fd08f5de626b0ea9fcdc2
    Reviewed-on: https://gerrit.libreoffice.org/51280
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index bb10acd00..89f698db9 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -197,6 +197,7 @@ static int careerSpanMs = 0;
 namespace
 {
 
+#if ENABLE_SUPPORT_KEY
 inline void shutdownLimitReached(WebSocketHandler& ws)
 {
     const std::string error = Poco::format(PAYLOAD_UNAVAILABLE_LIMIT_REACHED, LOOLWSD::MaxDocuments, LOOLWSD::MaxConnections);
@@ -215,6 +216,7 @@ inline void shutdownLimitReached(WebSocketHandler& ws)
         LOG_ERR("Error while shuting down socket on reaching limit: " << ex.what());
     }
 }
+#endif
 
 inline void infoLimitReached(const WebSocketHandler* ws)
 {


More information about the Libreoffice-commits mailing list