summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan@apache.org>2016-12-07 02:03:55 +0000
committerDamjan Jovanovic <damjan@apache.org>2016-12-07 02:03:55 +0000
commitffa8e248a5a746387cebb5aa4184cfecaede249a (patch)
treec2edbffd3840068d86534397c1845823e8f3e88e /io
parent891012df64bfa88702757c1403208f00da88c930 (diff)
Fix exports for main/io. The connector wasn't exporting anything
which was breaking the build on Windows, and we don't need an io/dllapi.h. Patch by: me
Notes
Notes: ignore: obsolete
Diffstat (limited to 'io')
-rw-r--r--io/Library_acceptor.mk5
-rw-r--r--io/Library_connector.mk5
-rw-r--r--io/Library_streams.mk5
-rw-r--r--io/Library_textinstream.mk5
-rw-r--r--io/Library_textoutstream.mk5
-rw-r--r--io/inc/io/dllapi.h36
-rw-r--r--io/source/TextInputStream/TextInputStream.cxx8
-rw-r--r--io/source/TextOutputStream/TextOutputStream.cxx8
-rw-r--r--io/source/acceptor/acceptor.cxx7
-rw-r--r--io/source/connector/connector.cxx6
-rw-r--r--io/source/stm/factreg.cxx8
11 files changed, 15 insertions, 83 deletions
diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk
index fbd7b9dadbad..784b5c3d5048 100644
--- a/io/Library_acceptor.mk
+++ b/io/Library_acceptor.mk
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)
$(eval $(call gb_Library_set_include,acceptor,\
$$(INCLUDE) \
- -I$(SRCDIR)/io/inc \
-I$(SRCDIR)/io/inc/pch \
))
-$(eval $(call gb_Library_add_defs,acceptor,\
- -DIO_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_Library_add_api,acceptor,\
udkapi \
))
diff --git a/io/Library_connector.mk b/io/Library_connector.mk
index eb75b759d906..49f25ea49f09 100644
--- a/io/Library_connector.mk
+++ b/io/Library_connector.mk
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connect
$(eval $(call gb_Library_set_include,connector,\
$$(INCLUDE) \
- -I$(SRCDIR)/io/inc \
-I$(SRCDIR)/io/inc/pch \
))
-$(eval $(call gb_Library_add_defs,connector,\
- -DIO_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_Library_add_api,connector,\
udkapi \
))
diff --git a/io/Library_streams.mk b/io/Library_streams.mk
index 0e41f47ef977..f5852c71b575 100644
--- a/io/Library_streams.mk
+++ b/io/Library_streams.mk
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams))
$(eval $(call gb_Library_set_include,streams,\
$$(INCLUDE) \
- -I$(SRCDIR)/io/inc \
-I$(SRCDIR)/io/inc/pch \
))
-$(eval $(call gb_Library_add_defs,streams,\
- -DIO_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_Library_add_api,streams,\
udkapi \
))
diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk
index 5027521110e9..242c9926a1b0 100644
--- a/io/Library_textinstream.mk
+++ b/io/Library_textinstream.mk
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStrea
$(eval $(call gb_Library_set_include,textinstream,\
$$(INCLUDE) \
- -I$(SRCDIR)/io/inc \
-I$(SRCDIR)/io/inc/pch \
))
-$(eval $(call gb_Library_add_defs,textinstream,\
- -DIO_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_Library_add_api,textinstream,\
udkapi \
))
diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk
index dad27972e13f..84a6655cffda 100644
--- a/io/Library_textoutstream.mk
+++ b/io/Library_textoutstream.mk
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStr
$(eval $(call gb_Library_set_include,textoutstream,\
$$(INCLUDE) \
- -I$(SRCDIR)/io/inc \
-I$(SRCDIR)/io/inc/pch \
))
-$(eval $(call gb_Library_add_defs,textoutstream,\
- -DIO_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_Library_add_api,textoutstream,\
udkapi \
))
diff --git a/io/inc/io/dllapi.h b/io/inc/io/dllapi.h
deleted file mode 100644
index 8e0fdc8e40ea..000000000000
--- a/io/inc/io/dllapi.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-#ifndef IO_DLLAPI_H
-#define IO_DLLAPI_H
-
-#include "sal/config.h"
-#include "sal/types.h"
-
-#if defined IO_DLLIMPLEMENTATION
-#define IO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define IO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 08de978b56ab..c4c0d259eb0b 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -44,8 +44,6 @@
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include "io/dllapi.h"
-
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextInputStream"
#define SERVICE_NAME "com.sun.star.io.TextInputStream"
@@ -507,19 +505,19 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-IO_DLLPUBLIC void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 76871c36f829..abdbc1037789 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -38,8 +38,6 @@
#include <rtl/tencinfo.h>
#include <rtl/unload.h>
-#include "io/dllapi.h"
-
#include <com/sun/star/io/XTextOutputStream.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -320,19 +318,19 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-IO_DLLPUBLIC void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 303eeae51984..dddfda19e1e9 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "acceptor.hxx"
-#include "io/dllapi.h"
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.Acceptor"
#define SERVICE_NAME "com.sun.star.connection.Acceptor"
@@ -351,19 +350,19 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-IO_DLLPUBLIC void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 418bc466a37f..04e6fed32f55 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -262,19 +262,19 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index ce904c056c4c..57fcde3cc1ce 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -28,8 +28,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
-#include "io/dllapi.h"
-
#include <com/sun/star/registry/XRegistryKey.hpp>
using namespace ::rtl;
@@ -96,19 +94,19 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-IO_DLLPUBLIC sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
//==================================================================================================
-IO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-IO_DLLPUBLIC void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );