summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-12 19:47:14 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-12 19:55:36 +0300
commitdb8786e34b1a451f0e6969681079f701627de6f9 (patch)
treec7bd2ddf228675812f0875b2a084788ee4e29103 /tools
parent9de73714775833f3ec7e7508d5fddcc8e4f19aed (diff)
The silly toolsdll.cxx was the same for unx and win
Change-Id: Ia83a37980446ee9a52e096e64a9ab77f106c8b37
Diffstat (limited to 'tools')
-rw-r--r--tools/Library_tl.mk11
-rw-r--r--tools/source/misc/toolsdll.cxx (renamed from tools/unx/source/dll/toolsdll.cxx)0
-rw-r--r--tools/win/source/dll/toolsdll.cxx39
3 files changed, 1 insertions, 49 deletions
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 34f247128516..0a160632c9e7 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/unx/source/dll/toolsdll.cxx b/tools/source/misc/toolsdll.cxx
index 414c7d23ca44..414c7d23ca44 100644
--- a/tools/unx/source/dll/toolsdll.cxx
+++ b/tools/source/misc/toolsdll.cxx
diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
deleted file mode 100644
index 40b600aefc28..000000000000
--- 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: */