diff options
| -rw-r--r-- | cpputools/source/unoexe/unoexe.cxx | 11 | ||||
| -rw-r--r-- | io/test/testcomponent.cxx | 11 | ||||
| -rw-r--r-- | io/test/testconnection.cxx | 10 | ||||
| -rw-r--r-- | remotebridges/examples/officeclient.cxx | 7 |
4 files changed, 8 insertions, 31 deletions
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 20c13a23a4d6..f2742149b0df 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoexe.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: svesik $ $Date: 2000-11-22 23:17:29 $ + * last change: $Author: mfe $ $Date: 2001-02-01 12:42:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -669,16 +669,9 @@ void ODisposingListener::waitFor( const Reference< XComponent > & xComp ) //################################################################################################## -#ifdef SOLARIS - extern "C" void ChangeGlobalInit(); -#endif extern "C" int SAL_CALL main( int argc, const char * argv[] ) { -#ifdef SOLARIS - ChangeGlobalInit(); -#endif - if (argc <= 1) { out( arUsingText ); diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 25d05d7c272f..ebfaf6d0be95 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testcomponent.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jbu $ $Date: 2000-12-08 11:07:30 $ + * last change: $Author: mfe $ $Date: 2001-02-01 12:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,9 +89,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; // Needed to switch on solaris threads -#ifdef SOLARIS -extern "C" void ChangeGlobalInit(); -#endif int main (int argc, char **argv) { @@ -100,10 +97,6 @@ int main (int argc, char **argv) printf( "usage : testcomponent service dll [additional dlls]\n" ); exit( 0 ); } -#ifdef SOLARIS - // switch on threads in solaris - ChangeGlobalInit(); -#endif // create service manager Reference< XMultiServiceFactory > xSMgr = createRegistryServiceFactory( diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index ff072ad78806..4c7adab9b4e3 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testconnection.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jbu $ $Date: 2001-01-08 13:27:40 $ + * last change: $Author: mfe $ $Date: 2001-02-01 12:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -216,9 +216,6 @@ void testConnection( const OUString &sConnectionDescription , #define DLL_POSTFIX ".dll" #endif -#ifdef SOLARIS - extern "C" ChangeGlobalInit(); -#endif #if (defined UNX) || (defined OS2) int main( int argc, char * argv[] ) @@ -226,9 +223,6 @@ int main( int argc, char * argv[] ) int __cdecl main( int argc, char * argv[] ) #endif { -#ifdef SOLARIS - ChangeGlobalInit(); -#endif Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) ); diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index 04f63a272755..e3a862360822 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -2,9 +2,9 @@ * * $RCSfile: officeclient.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jbu $ $Date: 2000-10-26 14:21:20 $ + * last change: $Author: mfe $ $Date: 2001-02-01 12:41:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,9 +94,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::frame; -#ifdef SOLARIS -extern "C" void ChangeGlobalInit(); -#endif namespace remotebridges_officeclient { |