tools/Library_tl.mk | 16 --------------- tools/source/generic/toolsin.cxx | 8 ------- tools/source/misc/toolsdll.cxx | 33 ++++++++++++++++++++++++++++++++ tools/unx/source/dll/toolsdll.cxx | 33 -------------------------------- tools/win/inc/dll.hxx | 28 --------------------------- tools/win/source/dll/toolsdll.cxx | 39 -------------------------------------- 6 files changed, 34 insertions(+), 123 deletions(-)
New commits: commit d8dbe5844b192f1339a3d38e0f477c5330c89194 Author: Tor Lillqvist <[email protected]> Date: Fri Apr 12 19:50:13 2013 +0300 Kill empty ImpDeInitWinTools() and the header with only its definition Change-Id: Ica82a4612da952c0c084974b708ef9dac753dcf6 diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 0a16063..9ea13e7 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -99,11 +99,6 @@ $(eval $(call gb_Library_use_externals,tl,\ ifeq ($(OS),WNT) -$(eval $(call gb_Library_set_include,tl,\ - -I$(SRCDIR)/tools/win/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Library_use_system_win32_libs,tl,\ mpr \ ole32 \ diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx index 24ce793..eb549d8 100644 --- a/tools/source/generic/toolsin.cxx +++ b/tools/source/generic/toolsin.cxx @@ -21,10 +21,6 @@ #include <string.h> #include <tools/debug.hxx> -#if defined WNT -#include <dll.hxx> -#endif - void InitTools() { DBG_DEBUGSTART(); @@ -38,10 +34,6 @@ void DeInitTools() void GlobalDeInitTools() { DBG_GLOBALDEBUGEND(); - -#if defined WNT - ImpDeInitWinTools(); -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx deleted file mode 100644 index 61e2bde..0000000 --- a/tools/win/inc/dll.hxx +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _DLL_HXX -#define _DLL_HXX - -// Um Resourcen wieder freizugeben -inline void ImpDeInitWinTools() {} - -#endif /* _DLL_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit db8786e34b1a451f0e6969681079f701627de6f9 Author: Tor Lillqvist <[email protected]> Date: Fri Apr 12 19:47:14 2013 +0300 The silly toolsdll.cxx was the same for unx and win Change-Id: Ia83a37980446ee9a52e096e64a9ab77f106c8b37 diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 34f2471..0a16063 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -74,6 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/misc/extendapplicationenvironment \ tools/source/misc/getprocessworkingdir \ tools/source/misc/solarmutex \ + tools/source/misc/toolsdll \ tools/source/rc/rc \ tools/source/rc/resary \ tools/source/rc/resmgr \ @@ -91,12 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/zcodec/zcodec \ )) -ifneq ($(OS),WNT) -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/unx/source/dll/toolsdll \ -)) -endif - $(eval $(call gb_Library_use_externals,tl,\ boost_headers \ zlib \ @@ -109,10 +104,6 @@ $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/win/source/dll/toolsdll \ -)) - $(eval $(call gb_Library_use_system_win32_libs,tl,\ mpr \ ole32 \ diff --git a/tools/source/misc/toolsdll.cxx b/tools/source/misc/toolsdll.cxx new file mode 100644 index 0000000..414c7d2 --- /dev/null +++ b/tools/source/misc/toolsdll.cxx @@ -0,0 +1,33 @@ +/* -*- 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <tools/shl.hxx> + +static void* aAppData[SHL_COUNT]; + +/* + * Query data for other libraries + */ + +void** GetAppData( sal_uInt16 nSharedLib ) +{ + return &(aAppData[nSharedLib]); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/unx/source/dll/toolsdll.cxx b/tools/unx/source/dll/toolsdll.cxx deleted file mode 100644 index 414c7d2..0000000 --- a/tools/unx/source/dll/toolsdll.cxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <tools/shl.hxx> - -static void* aAppData[SHL_COUNT]; - -/* - * Query data for other libraries - */ - -void** GetAppData( sal_uInt16 nSharedLib ) -{ - return &(aAppData[nSharedLib]); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx deleted file mode 100644 index 40b600a..0000000 --- a/tools/win/source/dll/toolsdll.cxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <windows.h> -#include <dll.hxx> -#include <tools/shl.hxx> - -// ======================================================================= - -#ifdef WNT - -static void* aAppData[SHL_COUNT]; - -// ----------------------------------------------------------------------- - -void** GetAppData( USHORT nSharedLib ) -{ - return &(aAppData[nSharedLib]); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
