summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-01-31 08:50:39 +0000
committerRüdiger Timm <rt@openoffice.org>2005-01-31 08:50:39 +0000
commit4a3c7f970b51350ae8cf88475e0abf2e98392b61 (patch)
tree66cf988a6218bb42804d385a6a651cd328aa3c2c /jvmfwk
parentba6904f4845460d06a1871fcd41e6c58182e7512 (diff)
INTEGRATION: CWS jre5issues (1.5.6); FILE MERGED
2005/01/14 10:11:43 jl 1.5.6.1: #i39912# #i40180# fixes for MAC, FREEBSD
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index db529664a643..38384680f512 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sunversion.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kz $ $Date: 2004-12-16 11:45:27 $
+ * last change: $Author: rt $ $Date: 2005-01-31 09:50:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,6 +77,9 @@ namespace jfw_plugin {
Pre releases relate this way
1.4.1-ea < 1.4.1-beta < 1.4.1-rc1
+ This class supports also a FreeBSD Java. This is currently necessary because
+ it also has the vendor string "Sun Microsystems Inc.".
+
An object acts as holder for the version string. That string may be present
even if the version could not be parsed. Then the version may not be compatible
to a SUN Java version.
@@ -107,6 +110,10 @@ protected:
Rel_RC1,
Rel_RC2,
Rel_RC3
+#if defined(FREEBSD)
+ ,
+ Rel_FreeBSD
+#endif
};
//contains major,minor,micro,update