harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r486437 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
Date Wed, 13 Dec 2006 00:39:59 GMT
Author: gshimansky
Date: Tue Dec 12 16:39:58 2006
New Revision: 486437

URL: http://svn.apache.org/viewvc?view=rev&rev=486437
Log:
Fixed NIO initialization after HARMONY-1505 r486159 commit
On Windows library symbols should be different from linux


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?view=diff&rev=486437&r1=486436&r2=486437
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Tue Dec 12 16:39:58 2006
@@ -265,9 +265,18 @@
     }
     
     apr_dso_handle_sym_t gdba, gdbc, ndb;
-    if( APR_SUCCESS == apr_dso_sym(&gdba, handle, "GetDirectBufferAddress")
-        && APR_SUCCESS == apr_dso_sym(&gdbc, handle, "GetDirectBufferCapacity")
-        && APR_SUCCESS == apr_dso_sym(&ndb, handle, "NewDirectByteBuffer") )

+#ifdef WIN32
+#define GET_DIRECT_BUFFER_ADDRESS "_GetDirectBufferAddress@8"
+#define GET_DIRECT_BUFFER_CAPACITY "_GetDirectBufferCapacity@8"
+#define NEW_DIRECT_BYTE_BUFFER "_NewDirectByteBuffer@16"
+#else
+#define GET_DIRECT_BUFFER_ADDRESS "GetDirectBufferAddress"
+#define GET_DIRECT_BUFFER_CAPACITY "GetDirectBufferCapacity"
+#define NEW_DIRECT_BYTE_BUFFER "NewDirectByteBuffer"
+#endif
+    if (APR_SUCCESS == apr_dso_sym(&gdba, handle, GET_DIRECT_BUFFER_ADDRESS)
+        && APR_SUCCESS == apr_dso_sym(&gdbc, handle, GET_DIRECT_BUFFER_CAPACITY)
+        && APR_SUCCESS == apr_dso_sym(&ndb, handle, NEW_DIRECT_BYTE_BUFFER))
     {
         jni_vtable.GetDirectBufferAddress = (GDBA)gdba;
         jni_vtable.GetDirectBufferCapacity = (GDBC)gdbc;



Mime
View raw message