From 2af1a97346d3e4c5009e7c76eecb2ea69458c577 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 19 Dec 2011 11:32:43 +0100 Subject: Removed superfluous CPPU_DLLPUBLIC from definitions. --- cppu/source/threadpool/threadident.cxx | 6 +++--- cppu/source/threadpool/threadpool.cxx | 14 +++++++------- cppu/source/uno/lbmap.cxx | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx index c190572b3d4a..f863f2872a0e 100644 --- a/cppu/source/threadpool/threadident.cxx +++ b/cppu/source/threadpool/threadident.cxx @@ -60,7 +60,7 @@ static inline void createLocalId( sal_Sequence **ppThreadId ) } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) SAL_THROW_EXTERN_C() { @@ -92,7 +92,7 @@ uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) } -extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_releaseIdFromCurrentThread() +extern "C" void SAL_CALL uno_releaseIdFromCurrentThread() SAL_THROW_EXTERN_C() { IdContainer *p = getIdContainer(); @@ -106,7 +106,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_releaseIdFromCurrentThread() } } -extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) +extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) SAL_THROW_EXTERN_C() { IdContainer *p = getIdContainer(); diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index fe1094774f70..312fd89c4375 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -412,7 +412,7 @@ struct _uno_ThreadPool sal_Int32 dummy; }; -extern "C" CPPU_DLLPUBLIC uno_ThreadPool SAL_CALL +extern "C" uno_ThreadPool SAL_CALL uno_threadpool_create() SAL_THROW_EXTERN_C() { MutexGuard guard( Mutex::getGlobalMutex() ); @@ -427,7 +427,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C() return h; } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C() { sal_Sequence *pThreadId = 0; @@ -437,7 +437,7 @@ uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C() uno_releaseIdFromCurrentThread(); } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) SAL_THROW_EXTERN_C() { @@ -452,13 +452,13 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) uno_releaseIdFromCurrentThread(); } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_threadpool_detach( uno_ThreadPool ) SAL_THROW_EXTERN_C() { // we might do here some tiding up in case a thread called attach but never detach } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_threadpool_putJob( uno_ThreadPool, sal_Sequence *pThreadId, @@ -469,7 +469,7 @@ uno_threadpool_putJob( ThreadPool::getInstance()->addJob( pThreadId, bIsOneway, pJob ,doRequest ); } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() { ThreadPool::getInstance()->dispose( @@ -477,7 +477,7 @@ uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() reinterpret_cast< sal_IntPtr >(hPool)) ); } -extern "C" CPPU_DLLPUBLIC void SAL_CALL +extern "C" void SAL_CALL uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() { ThreadPool::getInstance()->stopDisposing( diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 6df981866a0d..41add2c5276f 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -509,7 +509,7 @@ using namespace ::cppu; extern "C" { //################################################################################################## -CPPU_DLLPUBLIC void SAL_CALL uno_getMapping( +void SAL_CALL uno_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() @@ -577,7 +577,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_getMapping( } } //################################################################################################## -CPPU_DLLPUBLIC void SAL_CALL uno_getMappingByName( +void SAL_CALL uno_getMappingByName( uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo, rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() -- cgit