[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 20:11:20 UTC 2018


 wsd/LOOLWSD.cpp |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit dd3d50c1b3b339998f54aad9bc58083a8ad23487
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 30 22:06:25 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 22:09:52 2018 +0200

    Reduce MOBILEAPP ifdef clutter a little bit
    
    This means some no-op UnitWSD functions will get called, but so what.
    
    Change-Id: Ibdce82d9933699fe15947daea221ad67148dfddd

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e7e49e021..8d89e65e5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3171,9 +3171,7 @@ int LOOLWSD::innerMain()
     std::cerr << "Ready to accept connections on port " << ClientPortNumber <<  ".\n" << std::endl;
 #endif
 
-#ifndef MOBILEAPP
     const auto startStamp = std::chrono::steady_clock::now();
-#endif
 
     while (!TerminationFlag && !ShutdownRequestFlag)
     {
@@ -3188,7 +3186,6 @@ int LOOLWSD::innerMain()
         // Wake the prisoner poll to spawn some children, if necessary.
         PrisonerPoll.wakeup();
 
-#ifndef MOBILEAPP
         const std::chrono::milliseconds::rep timeSinceStartMs = std::chrono::duration_cast<std::chrono::milliseconds>(
                                             std::chrono::steady_clock::now() - startStamp).count();
 
@@ -3203,7 +3200,6 @@ int LOOLWSD::innerMain()
             break;
         }
 #endif
-#endif
     }
     // Stop the listening to new connections
     // and wait until sockets close.


More information about the Libreoffice-commits mailing list