From 6d14c422f131693533ccc63741fa807112ea59af Mon Sep 17 00:00:00 2001 From: Andrzej Hunt Date: Mon, 28 Jul 2014 20:23:03 +0200 Subject: 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.) Conflicts: libreofficekit/Module_libreofficekit.mk Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32 --- UnoControls/Makefile | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 UnoControls/Makefile diff --git a/UnoControls/Makefile b/UnoControls/Makefile deleted file mode 100644 index 0997e628485b..000000000000 --- a/UnoControls/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: -- cgit