sunjre.cxx (ce15f79d) sunjre.cxx (9fbe0120)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 61 unchanged lines hidden (view full) ---

70 "/bin/client/jvm.dll",
71 // TODO add jrockit here
72#elif defined(MACOSX)
73 "/lib/server/libjvm.dylib"
74#elif defined(UNX)
75 "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
76 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
77 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 61 unchanged lines hidden (view full) ---

70 "/bin/client/jvm.dll",
71 // TODO add jrockit here
72#elif defined(MACOSX)
73 "/lib/server/libjvm.dylib"
74#elif defined(UNX)
75 "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
76 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
77 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
78 "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
78 "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
79 "/lib/server/libjvm.so" // > 1.8
79#endif
80 };
81 *size = sizeof(ar) / sizeof (char*);
82 return ar;
83}
84
85char const* const* SunInfo::getLibraryPaths(int* size)
86{
87#ifdef UNX
88 static char const * ar[] = {
89
90 "/lib/" JFW_PLUGIN_ARCH "/client",
91 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
80#endif
81 };
82 *size = sizeof(ar) / sizeof (char*);
83 return ar;
84}
85
86char const* const* SunInfo::getLibraryPaths(int* size)
87{
88#ifdef UNX
89 static char const * ar[] = {
90
91 "/lib/" JFW_PLUGIN_ARCH "/client",
92 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
92 "/lib/" JFW_PLUGIN_ARCH
93 "/lib/" JFW_PLUGIN_ARCH,
94 "/lib" // > 1.8
93
94 };
95 *size = sizeof(ar) / sizeof (char*);
96 return ar;
97#else
98 size = 0;
99 return NULL;
100#endif

--- 24 unchanged lines hidden --- 		95
96 };
97 *size = sizeof(ar) / sizeof (char*);
98 return ar;
99#else
100 size = 0;
101 return NULL;
102#endif

--- 24 unchanged lines hidden ---