jvmfwk brokeness in m103 and m104
Etsushi Kato <[email protected]>
| Newsgroups | gmane.comp.openoffice.devel.porting |
|---|---|
| Message-ID | <[email protected]> |
Hi, I've found a bug in recent otherjre.cxx in jvmfwk. This prevents building testtool in MacOSX. Please confirm, ericb. Cheers, -- Etsushi Kato [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
jvmfwk.diff
(application/octet-stream, 834 B)
Index: otherjre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx,v
retrieving revision 1.5
diff -u -r1.5 otherjre.cxx
--- otherjre.cxx 11 May 2005 11:31:21 -0000 1.5
+++ otherjre.cxx 19 May 2005 01:56:39 -0000
@@ -98,14 +98,13 @@
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll"
#elif UNX
-#ifdef MACOSX
- "/../../../JavaVM"
-#endif
#if defined(LINUX) && defined(POWERPC)
"/bin/classic/libjvm.so",
- "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so" // for Blackdown PPC
+ "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC
+#elif defined(MACOSX)
+ "/../../../JavaVM"
#else
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",