diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-19 00:48:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-20 11:25:22 +0300 |
| commit | 247f197cba49f2382995196ae50b3fc15ffa9db4 (patch) | |
| tree | 371c194d7552d930655161c147f80c25b4279f21 | |
| parent | a001eab07650402a39948af086e836a043412e00 (diff) | |
Skip vendors that are irrelevant
There surely are no Apple JVMs for other OSes than OS X.
Correspondingly, there surely are no IBM, Blackdown, BEA, FSF or
FreeBSD JVMs for OS X. At least not ones that would be relevant today.
Change-Id: I0ee6f904665a2145771802beffe54268718bef50
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 11ed82e7a668..3f23ff31cc1b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -36,15 +36,20 @@ namespace jfw_plugin by "\xXX\xXX" */ BEGIN_VENDOR_MAP() +// For OS X, don't bother with implementations that aren't relevant (or have never existed) +#ifdef MACOSX + VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo) + VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo) +#endif VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) +#ifndef MACOSX VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) - VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo) - VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo) VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo) VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo) VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo) +#endif END_VENDOR_MAP() |