summaryrefslogtreecommitdiff
path: root/desktop/source/offacc
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-04-15 14:46:15 -0400
committerPeter Foley <pefoley2@verizon.net>2013-04-15 14:47:43 -0400
commita81f161b120de283cf9c5532223a022dbcbeaab7 (patch)
treef67e84578c67e535a8aafea5708047e23d50d39d /desktop/source/offacc
parent0b2eae62f1ccaad1c963d2637aafaa1ce9062455 (diff)
add desktop libs to libmerged
Change-Id: I0e5477f84de316598015330cea995e42f1249acb
Diffstat (limited to 'desktop/source/offacc')
-rw-r--r--desktop/source/offacc/acceptor.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 56471ca3aa8c..21b97f4ad7b4 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -28,7 +28,7 @@
namespace desktop
{
-extern "C" void workerfunc (void * acc)
+extern "C" void offacc_workerfunc (void * acc)
{
((Acceptor*)acc)->run();
}
@@ -157,7 +157,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
m_aProtocol = m_aAcceptString.copy( nIndex1, nIndex2 - nIndex1 );
// start accepting in new thread...
- m_thread = osl_createThread(workerfunc, this);
+ m_thread = osl_createThread(offacc_workerfunc, this);
m_bInit = sal_True;
bOk = sal_True;
}