+2001-07-24 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * prims.cc (_JNI_OnLoad): New function.
+ (JNI_OnLoad): Use it.
+ (_Jv_CreateJavaVM): Check for _JNI_OnLoad, not NULL.
+
2001-07-24 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.am (AM_MAKEFLAGS): Pass RUNTESTFLAGS.
#endif
-/* This will be non-NULL if the user has preloaded a JNI library, or
- linked one into the executable. */
+/* This will be different from _JNI_OnLoad if the user has preloaded a JNI
+ library, or linked one into the executable. */
extern "C"
{
-#pragma weak JNI_OnLoad
+ /* Some systems, like Tru64 UNIX, don't support weak definitions, so use
+ an empty dummy function to check if the user provided his own. */
+#pragma weak JNI_OnLoad = _JNI_OnLoad
extern jint JNI_OnLoad (JavaVM *, void *) __attribute__((weak));
+
+ jint _JNI_OnLoad (JavaVM *vm, void *)
+ {
+ return 0;
+ }
}
environment variable. We take advatage of this here to allow for
dynamically loading a JNI library into a fully linked executable. */
- if (JNI_OnLoad != NULL)
+ if (JNI_OnLoad != _JNI_OnLoad)
{
JavaVM *vm = _Jv_GetJavaVM ();
if (vm == NULL)