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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 2 11:08:07 UTC 2018


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

New commits:
commit 4a24055a74308b13f1f9b23f33a309bc42e63b5f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 2 12:38:31 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 2 12:39:11 2018 +0200

    Bin one case of nested #ifndef MOBILEAPP
    
    (Might be more. Is there some tool to automatically detect this?)

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7af8b7311..de83d4b8f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1555,10 +1555,8 @@ bool LOOLWSD::createForKit()
     if (UnitWSD::get().hasKitHooks())
         args.push_back("--unitlib=" + UnitTestLibrary);
 
-#ifndef MOBILEAPP
     if (DisplayVersion)
         args.push_back("--version");
-#endif
 
     if (NoCapsForKit)
         args.push_back("--nocaps");
@@ -1612,7 +1610,7 @@ bool LOOLWSD::createForKit()
 #endif
 }
 
-#endif
+#endif // !MOBILEAPP
 
 #ifdef FUZZER
 std::mutex Connection::Mutex;


More information about the Libreoffice-commits mailing list