You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/07 02:03:55 UTC
svn commit: r1773001 - in /openoffice/trunk/main/io: ./ inc/io/
source/TextInputStream/ source/TextOutputStream/ source/acceptor/
source/connector/ source/stm/
Author: damjan
Date: Wed Dec 7 02:03:55 2016
New Revision: 1773001
URL: http://svn.apache.org/viewvc?rev=1773001&view=rev
Log:
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
Removed:
openoffice/trunk/main/io/inc/io/
Modified:
openoffice/trunk/main/io/Library_acceptor.mk
openoffice/trunk/main/io/Library_connector.mk
openoffice/trunk/main/io/Library_streams.mk
openoffice/trunk/main/io/Library_textinstream.mk
openoffice/trunk/main/io/Library_textoutstream.mk
openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx
openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx
openoffice/trunk/main/io/source/acceptor/acceptor.cxx
openoffice/trunk/main/io/source/connector/connector.cxx
openoffice/trunk/main/io/source/stm/factreg.cxx
Modified: openoffice/trunk/main/io/Library_acceptor.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_acceptor.mk?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/Library_acceptor.mk (original)
+++ openoffice/trunk/main/io/Library_acceptor.mk Wed Dec 7 02:03:55 2016
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfi
$(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 \
))
Modified: openoffice/trunk/main/io/Library_connector.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_connector.mk?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/Library_connector.mk (original)
+++ openoffice/trunk/main/io/Library_connector.mk Wed Dec 7 02:03:55 2016
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfi
$(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 \
))
Modified: openoffice/trunk/main/io/Library_streams.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_streams.mk?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/Library_streams.mk (original)
+++ openoffice/trunk/main/io/Library_streams.mk Wed Dec 7 02:03:55 2016
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfi
$(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 \
))
Modified: openoffice/trunk/main/io/Library_textinstream.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_textinstream.mk?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/Library_textinstream.mk (original)
+++ openoffice/trunk/main/io/Library_textinstream.mk Wed Dec 7 02:03:55 2016
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfi
$(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 \
))
Modified: openoffice/trunk/main/io/Library_textoutstream.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/Library_textoutstream.mk?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/Library_textoutstream.mk (original)
+++ openoffice/trunk/main/io/Library_textoutstream.mk Wed Dec 7 02:03:55 2016
@@ -29,14 +29,9 @@ $(eval $(call gb_Library_set_componentfi
$(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 \
))
Modified: openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx (original)
+++ openoffice/trunk/main/io/source/TextInputStream/TextInputStream.cxx Wed Dec 7 02:03:55 2016
@@ -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_entr
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 );
Modified: openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx (original)
+++ openoffice/trunk/main/io/source/TextOutputStream/TextOutputStream.cxx Wed Dec 7 02:03:55 2016
@@ -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_entr
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 );
Modified: openoffice/trunk/main/io/source/acceptor/acceptor.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/acceptor/acceptor.cxx?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/acceptor/acceptor.cxx (original)
+++ openoffice/trunk/main/io/source/acceptor/acceptor.cxx Wed Dec 7 02:03:55 2016
@@ -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_entr
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 );
Modified: openoffice/trunk/main/io/source/connector/connector.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/connector/connector.cxx?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/connector/connector.cxx (original)
+++ openoffice/trunk/main/io/source/connector/connector.cxx Wed Dec 7 02:03:55 2016
@@ -262,19 +262,19 @@ static struct ImplementationEntry g_entr
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 );
Modified: openoffice/trunk/main/io/source/stm/factreg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/io/source/stm/factreg.cxx?rev=1773001&r1=1773000&r2=1773001&view=diff
==============================================================================
--- openoffice/trunk/main/io/source/stm/factreg.cxx (original)
+++ openoffice/trunk/main/io/source/stm/factreg.cxx Wed Dec 7 02:03:55 2016
@@ -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_entr
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 );