diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-12-13 21:50:15 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-12-13 22:12:39 +0100 |
| commit | 68eb27e3bd5d536e7b00b7dc145ae4943b95bec9 (patch) | |
| tree | dff28f4144c0332cc61b79628d34c828c61fd6b3 /include/tools | |
| parent | 29baa05bb9c62ef1e4c759f7c4744d11dd40a385 (diff) | |
tools: reimplement SVLIBRARY macro & remove it from solar.h
Change-Id: I03f8f5fd656d62410821f2f2851f1c584c97d1f4
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/solar.h | 10 | ||||
| -rw-r--r-- | include/tools/svlibrary.h | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/include/tools/solar.h b/include/tools/solar.h index d53b20f0e58a..a1b10d6e9f01 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -105,16 +105,6 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<s #endif #endif -#if defined(_WIN32) -#define SVLIBRARY( Base ) Base "lo.dll" -#elif defined MACOSX -#define SVLIBRARY( Base ) "lib" Base "lo.dylib" -#elif defined UNX -#define SVLIBRARY( Base ) "lib" Base "lo.so" -#else - #error unknown platform -#endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/svlibrary.h b/include/tools/svlibrary.h new file mode 100644 index 000000000000..2a46d8c88412 --- /dev/null +++ b/include/tools/svlibrary.h @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef SVLIBRARY +#define SVLIBRARY( Base ) SAL_MODULENAME( Base "lo" ) +#include <osl/module.h> +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |