Skip to content

Commit

Permalink
Bin two pointless #defines
Browse files Browse the repository at this point in the history
They are used only in one place, so expand them there.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: Ib8ff671276c8a9b8fefae992487cc62a4ba3823c
  • Loading branch information
Tor Lillqvist authored and tml1024 committed Dec 18, 2024
1 parent 7284174 commit 11d3447
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions kit/Kit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@
#include "ios.h"
#endif

#define LIB_SOFFICEAPP "lib" "sofficeapp" ".so"
#define LIB_MERGED "lib" "mergedlo" ".so"

using Poco::Exception;
using Poco::File;
using Poco::JSON::Object;
Expand Down Expand Up @@ -3873,8 +3870,8 @@ bool startURP(std::shared_ptr<lok::Office> LOKit, void** ppURPContext)
/// Initializes LibreOfficeKit for cross-fork re-use.
bool globalPreinit(const std::string &loTemplate)
{
const std::string libSofficeapp = loTemplate + "/program/" LIB_SOFFICEAPP;
const std::string libMerged = loTemplate + "/program/" LIB_MERGED;
const std::string libSofficeapp = loTemplate + "/program/libsofficeapp.so";
const std::string libMerged = loTemplate + "/program/libmergedlo.so";

std::string loadedLibrary;
// we deliberately don't dlclose handle on success, make it
Expand Down

0 comments on commit 11d3447

Please sign in to comment.