diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:52:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:52:06 +0000 |
| commit | 04334c5639369fb2567eb7f19ad29e7b2ce7ecc9 (patch) | |
| tree | 34670397e01f2c3977cacd404a4e14a4e4cf7671 /jvmfwk/inc | |
| parent | 84a306efa7ba4a99f034331e188b60c93cefa32a (diff) | |
INTEGRATION: CWS nojava1 (1.9.20); FILE MERGED
2004/08/16 15:22:50 cmc 1.9.20.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:13:54 cmc 1.9.20.1: #i33045# build jvmfwk even without java, just default to failure on javarelated stuff
Diffstat (limited to 'jvmfwk/inc')
| -rw-r--r-- | jvmfwk/inc/jvmfwk/framework.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 5af8cb814d49..d45561e256c5 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -2,9 +2,9 @@ * * $RCSfile: framework.h,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: jl $ $Date: 2004-05-21 15:07:05 $ + * last change: $Author: hr $ $Date: 2004-11-09 11:52:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,7 +64,13 @@ #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" { |