diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:52:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:52:17 +0000 |
| commit | 57e221376551a3004ebc896ddb123776b01a9f76 (patch) | |
| tree | 214d3cefc00505a445c0b10bda4db212ad64a1a5 /jvmfwk/inc | |
| parent | 04334c5639369fb2567eb7f19ad29e7b2ce7ecc9 (diff) | |
INTEGRATION: CWS nojava1 (1.9.8); FILE MERGED
2004/09/24 14:21:57 haggai 1.9.8.3: RESYNC: (1.9-1.10); FILE MERGED
2004/08/16 15:22:50 cmc 1.9.8.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:13:54 cmc 1.9.8.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/vendorplugin.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h index a2dd9fae1f9b..6b625e3aa643 100644 --- a/jvmfwk/inc/jvmfwk/vendorplugin.h +++ b/jvmfwk/inc/jvmfwk/vendorplugin.h @@ -2,9 +2,9 @@ * * $RCSfile: vendorplugin.h,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2004-07-23 11:49:40 $ + * last change: $Author: hr $ $Date: 2004-11-09 11:52:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,9 @@ #include "jvmfwk/framework.h" #include "rtl/ustring.h" +#ifdef SOLAR_JAVA #include "jni.h" +#endif #ifdef __cplusplus extern "C" { |