$OpenBSD: patch-src_bsd_javavm_runtime_javai_md_c,v 1.1 2003/08/17 01:06:57 naddy Exp $
--- src/bsd/javavm/runtime/javai_md.c.orig	Tue Jul  8 13:04:37 2003
+++ src/bsd/javavm/runtime/javai_md.c	Thu Jul 10 10:47:31 2003
@@ -28,6 +28,12 @@
 #define HPI_DLL "libhpi.so"
 #endif
 
+#if defined(__OpenBSD__) && !defined(__ELF__)
+#define BSD_C_SYM(x) ("_" ## x)
+#else
+#define BSD_C_SYM(x) x
+#endif
+
 void *
 InitializeHPI(void *args)
 {
@@ -71,11 +77,7 @@ InitializeHPI(void *args)
 	goto bail;
     }
     DLL_Initialize = (jint (JNICALL *)(GetInterfaceFunc *, void *))
-#if defined(__OpenBSD__)
-        dlsym(hpi_handle, "_DLL_Initialize");
-#else
-        dlsym(hpi_handle, "DLL_Initialize");
-#endif
+    dlsym(hpi_handle, BSD_C_SYM("DLL_Initialize"));
     if (DLL_Initialize == NULL ||
         (*DLL_Initialize)(&getintf, args) < 0) {
         goto bail;
@@ -104,7 +106,7 @@ GetPropertiesMD()
 #if defined(__OpenBSD__) || (defined(__FreeBSD__) && (__FreeBSD__ < 3))
 #ifdef __OpenBSD__
 	strcpy(buf, dlfname(dlsym(dlopen(JVM_DLL, RTLD_LAZY),
-				  "_GetPropertiesMD")));
+				  BSD_C_SYM("GetPropertiesMD"))));
 #else
 	strcpy(buf, dlfname(dlsym(0, "_GetPropertiesMD")));
 #endif
