Kaydet (Commit) db8786e3 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

The silly toolsdll.cxx was the same for unx and win

Change-Id: Ia83a37980446ee9a52e096e64a9ab77f106c8b37
üst 9de73714
...@@ -74,6 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ ...@@ -74,6 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/misc/extendapplicationenvironment \ tools/source/misc/extendapplicationenvironment \
tools/source/misc/getprocessworkingdir \ tools/source/misc/getprocessworkingdir \
tools/source/misc/solarmutex \ tools/source/misc/solarmutex \
tools/source/misc/toolsdll \
tools/source/rc/rc \ tools/source/rc/rc \
tools/source/rc/resary \ tools/source/rc/resary \
tools/source/rc/resmgr \ tools/source/rc/resmgr \
...@@ -91,12 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ ...@@ -91,12 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/zcodec/zcodec \ 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,\ $(eval $(call gb_Library_use_externals,tl,\
boost_headers \ boost_headers \
zlib \ zlib \
...@@ -109,10 +104,6 @@ $(eval $(call gb_Library_set_include,tl,\ ...@@ -109,10 +104,6 @@ $(eval $(call gb_Library_set_include,tl,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_exception_objects,tl,\
tools/win/source/dll/toolsdll \
))
$(eval $(call gb_Library_use_system_win32_libs,tl,\ $(eval $(call gb_Library_use_system_win32_libs,tl,\
mpr \ mpr \
ole32 \ ole32 \
......
/* -*- 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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment