diff options
Diffstat (limited to 'jvmaccess')
| -rw-r--r-- | jvmaccess/inc/jvmaccess/virtualmachine.hxx | 6 | ||||
| -rw-r--r-- | jvmaccess/workbench/javainfo/javainfotest.cxx | 5 |
2 files changed, 8 insertions, 3 deletions
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 diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx index a87cffadfdaf..bb7c9875825d 100644 --- a/jvmaccess/workbench/javainfo/javainfotest.cxx +++ b/jvmaccess/workbench/javainfo/javainfotest.cxx @@ -35,12 +35,15 @@ #include <stdio.h> #include <vector> -using namespace rtl; using namespace std; using namespace osl; using jvmaccess::JavaInfo; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + #define OUSTR( x ) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #define JAVA_VERSION "1.4.1_01" |