From 44abf1ea66fbf0ee3f3b5195c6af6b631d633cba Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Fri, 28 Jan 2011 00:07:49 +0200
Subject: Need to use exactly the same names as in the JDK in the
 non-SOLAR_JAVA case

Use struct JNIEnv_ and struct JavaVM_, with underscores. Otherwise a
mangled name in the map files won't match.
---
 jvmaccess/inc/jvmaccess/virtualmachine.hxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'jvmaccess/inc')

diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index 275568d2612e..3bffbc834f90 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -35,8 +35,10 @@
 #ifdef SOLAR_JAVA
 #include "jni.h"
 #else
-struct JNIEnv;
-struct JavaVM;
+struct JNIEnv_;
+typedef JNIEnv_ JNIEnv;
+struct JavaVM_;
+typedef JavaVM_ JavaVM;
 typedef int jint;
 typedef void * jobject;
 #endif
-- 
cgit