From 047db7dd45f07165a4d980f1bfd4385f1b789a41 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 08:05:58 +0000 Subject: CWS-TOOLING: integrate CWS jsc311 --- bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 8 +++++++- bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'bean') diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c index b14ace022..54b6105fa 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 #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 94840de16..7d2b47391 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 #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" -- cgit v1.2.3