diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-12-13 21:50:15 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-08 09:14:27 +0100 |
| commit | b6671e7600694fd619e9a9b4be7e7390bf0877c1 (patch) | |
| tree | fd701fa1f8aa69383b0dc1c9d2ade1125ad831fa /include | |
| parent | e555553e16cbe5ce34d77940278952a14696eecd (diff) | |
tools: reimplement SVLIBRARY macro & remove it from solar.h
Change-Id: I03f8f5fd656d62410821f2f2851f1c584c97d1f4
Diffstat (limited to 'include')
| -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 2c4793b95f38..e7d9710f21b8 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -106,16 +106,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: */ |