diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-28 20:23:03 +0200 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-29 07:11:20 +0200 |
| commit | 9e7bdb422d12d8be4b76eaf065e3aea8f9055f12 (patch) | |
| tree | a1854228e61d9904edae4cb3239a3b1846db2917 /smoketest | |
| parent | fdo#79578: Properly update formulas upon change in db collection. (diff) | |
| download | core-9e7bdb422d12d8be4b76eaf065e3aea8f9055f12.tar.gz core-9e7bdb422d12d8be4b76eaf065e3aea8f9055f12.zip | |
Kill the libreofficekit static library / shim.c.
It looks like the cleanest method of getting lok_init into
a LibreOfficeKitInit.h header (in a c89 compatible way) is to
have it as a static function.
(inline is only available in C99 or later -- this is actually
available on Linux which is the only place that we can actually
use lok_init anyways currently, however given we have to keep
c89 for the C code (for MSVC) compatibility, selectively enabling
c99 would likely be more messy.)
Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/Executable_libtest.mk | 4 | ||||
| -rw-r--r-- | smoketest/libtest.cxx | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk index 881e604e07dc..3b3bd1634e1a 100644 --- a/smoketest/Executable_libtest.mk +++ b/smoketest/Executable_libtest.mk @@ -17,10 +17,6 @@ $(eval $(call gb_Executable_use_libraries,libtest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_use_static_libraries,libtest,\ - libreofficekit \ -)) - $(eval $(call gb_Executable_add_libs,libtest,\ -ldl \ -pthread \ diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx index 8a0b7242c46f..91bbcaea096e 100644 --- a/smoketest/libtest.cxx +++ b/smoketest/libtest.cxx @@ -14,6 +14,7 @@ #include <math.h> #include <sys/time.h> #include <sal/types.h> +#include <LibreOfficeKit/LibreOfficeKitInit.h> #include <LibreOfficeKit/LibreOfficeKit.hxx> using namespace ::lok; |