Android compilation fix

b1b915c8 · Tor Lillqvist · 9ee4f4eb · b1b915c8
Kaydet (Commit) b1b915c8 authored Kas 24, 2011 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

virtualmachine.cxx jvmaccess/source/virtualmachine.cxx +10 -1

No files found.
--- a/jvmaccess/source/virtualmachine.cxx
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -105,7 +105,16 @@ JNIEnv * VirtualMachine::attachThread(bool * pAttached) const
    }
    if (pEnv == 0)
    {
-        if (m_pVm->AttachCurrentThread(reinterpret_cast< void ** >(&pEnv), 0)
+        if (m_pVm->AttachCurrentThread
+            (
+#ifndef ANDROID
+             reinterpret_cast< void ** >(&pEnv),
+#else
+             // The Android <jni.h> has AttachCurrentThread() taking a
+             // JNIEnv** and not void **
+             &pEnv,
+#endif
+             0)
            != JNI_OK)
            return 0;
        *pAttached = true;