diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
| commit | 57a8051720ae2285c8d386885657e1b51a5709d4 (patch) | |
| tree | 95695dab884bde09fb703df0c1849911679948cf /bean | |
| parent | f8fda7d6f1e7d32faa470e15d52a92f0be3c7dea (diff) | |
CWS-TOOLING: integrate CWS jsc311
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 8 | ||||
| -rw-r--r-- | bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c index 181c31251272..cb2fcece511c 100644 --- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: com_sun_star_beans_LocalOfficeWindow.c,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.10.1 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,12 @@ #include <X11/Intrinsic.h> #include "jni.h" + +// Workaround for problematic IBM JDK 1.6.0 on ppc +#ifndef _JNI_IMPORT_OR_EXPORT_ +#define _JNI_IMPORT_OR_EXPORT_ +#endif + #include "jawt_md.h" #include "jawt.h" diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c index 7ecedb35a122..3325b0c02fb3 100644 --- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: com_sun_star_comp_beans_LocalOfficeWindow.c,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.10.1 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,12 @@ #include <X11/Intrinsic.h> #include "jni.h" + +// Workaround for problematic IBM JDK 1.6.0 on ppc +#ifndef _JNI_IMPORT_OR_EXPORT_ +#define _JNI_IMPORT_OR_EXPORT_ +#endif + #include "jawt_md.h" #include "jawt.h" |