diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2003-06-07 22:09:48 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2003-06-07 22:09:48 +0000 |
commit | 5191c1d5a85d6037d951f877eee67b94b669da7e (patch) | |
tree | 57007548daed9ef31884fdbe9398458989db24a3 /editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx | |
parent | Upgrade to OO1.1 beta2. (diff) |
Upgrade to OO1.1 beta2.
Notes
Notes:
svn path=/head/; revision=82477
Diffstat (limited to 'editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx')
-rw-r--r-- | editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx deleted file mode 100644 index a0796522b4c8..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx +++ /dev/null @@ -1,29 +0,0 @@ ---- ../stoc/source/javavm/javavm.cxx.orig Fri Mar 21 12:03:58 2003 -+++ ../stoc/source/javavm/javavm.cxx Fri Mar 21 12:04:24 2003 -@@ -1097,7 +1097,7 @@ - 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; -@@ -1109,7 +1109,7 @@ - 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; -@@ -1596,7 +1596,7 @@ - // 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 -+#ifdef LINUX || defined FREEBSD - if(!m_aJavaLib.load(jvm.getRuntimeLib(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW)) - #else - if(!m_aJavaLib.load(jvm.getRuntimeLib())) |