diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 22:46:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:18:50 +0300 |
| commit | b7525f1f1d123084b60269f420300afdd405b0d1 (patch) | |
| tree | 0b2e32b3879a27802c0e607b187c1b43ab697c9e /jvmaccess/inc/jvmaccess | |
| parent | f5928f09ad53de2c4683000619d29be140a97be8 (diff) | |
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
Diffstat (limited to 'jvmaccess/inc/jvmaccess')
| -rw-r--r-- | jvmaccess/inc/jvmaccess/classpath.hxx | 6 | ||||
| -rw-r--r-- | jvmaccess/inc/jvmaccess/virtualmachine.hxx | 9 |
2 files changed, 0 insertions, 15 deletions
diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx index 3fb17f3c7131..507af76d3759 100644 --- a/jvmaccess/inc/jvmaccess/classpath.hxx +++ b/jvmaccess/inc/jvmaccess/classpath.hxx @@ -24,13 +24,7 @@ #include "sal/config.h" #include "com/sun/star/uno/Reference.hxx" -#if defined SOLAR_JAVA #include "jni.h" -#else -struct JNIEnv; -typedef void * jclass; -typedef void * jobjectArray; -#endif namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx index f425daed6a2a..57ac5ead39f4 100644 --- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx +++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx @@ -24,16 +24,7 @@ #include "rtl/ref.hxx" #include "salhelper/simplereferenceobject.hxx" -#ifdef SOLAR_JAVA #include "jni.h" -#else -struct JNIEnv_; -typedef JNIEnv_ JNIEnv; -struct JavaVM_; -typedef JavaVM_ JavaVM; -typedef int jint; -typedef void * jobject; -#endif namespace jvmaccess { |