diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 10:08:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 10:08:36 +0000 |
| commit | abddba800f70a07a0e2e04838583501270580ad6 (patch) | |
| tree | baeb164ee133b91240845fd00d2c1213d6c9cb4c /stoc/source | |
| parent | af627f09c21a49ce031655e3c2e119d46bd83dc5 (diff) | |
INTEGRATION: CWS mh11rc (1.58.2); FILE MERGED
2003/06/06 08:16:55 mh 1.58.2.1: join: from beta2
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 13d5943aeb74..dd98d40c78a7 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javavm.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: vg $ $Date: 2003-05-28 13:30:15 $ + * last change: $Author: vg $ $Date: 2003-06-12 11:08:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1104,7 +1104,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) static_cast< css::java::JavaNotConfiguredException * >(0)))) { -#if defined LINUX +#if defined LINUX || defined FREEBSD // Because of LD_LIBRARY_PATH, even javaldx --use-links does // not work sometimes: m_bDontCreateJvm = true; @@ -1116,7 +1116,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) css::java::MissingJavaRuntimeException * >( 0)))) { -#if defined LINUX +#if defined LINUX || defined FREEBSD // Because of LD_LIBRARY_PATH, even javaldx --use-links does // not work sometimes: m_bDontCreateJvm = true; @@ -1604,7 +1604,7 @@ JavaVM * JavaVirtualMachine::createJavaVM(stoc_javavm::JVM const & jvm, // On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging, because // libjdwp.so need a symbol (fork1) from libjvm which it only gets if the jvm is loaded // witd RTLD_GLOBAL. On Solaris libjdwp.so is correctly linked with libjvm.so -#ifdef LINUX +#if defined(LINUX)|| defined(FREEBSD) if(!m_aJavaLib.load(jvm.getRuntimeLib(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW)) #else if(!m_aJavaLib.load(jvm.getRuntimeLib())) |