From b7525f1f1d123084b60269f420300afdd405b0d1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Apr 2013 22:46:53 +0200 Subject: Drop jvmaccess and jvmfwk when no SOLAR_JAVA Just sprinkle #ifdef SOLAR_JAVA into the code instead. In the source for jvmaccess and jvmfwk such ifdefs can be removed as it isn't compiled unless SOLAR_JAVA. Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606 --- jvmfwk/inc/jvmfwk/framework.h | 6 ------ jvmfwk/inc/jvmfwk/vendorplugin.h | 2 -- 2 files changed, 8 deletions(-) (limited to 'jvmfwk/inc') diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 638bd960bb41..dbc10ac125b9 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -25,13 +25,7 @@ #include "jvmfwkdllapi.h" #include "rtl/ustring.h" #include "osl/mutex.h" -#ifdef SOLAR_JAVA #include "jni.h" -#else -struct JavaVMOption; -struct JavaVM; -struct JNIEnv; -#endif #ifdef __cplusplus extern "C" { diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h index 11fc6aaffc6e..5ca5e10009ba 100644 --- a/jvmfwk/inc/jvmfwk/vendorplugin.h +++ b/jvmfwk/inc/jvmfwk/vendorplugin.h @@ -24,9 +24,7 @@ #include "jvmfwkplugindllapi.h" #include "jvmfwk/framework.h" #include "rtl/ustring.h" -#ifdef SOLAR_JAVA #include "jni.h" -#endif #ifdef __cplusplus extern "C" { -- cgit