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 | 047db7dd45f07165a4d980f1bfd4385f1b789a41 (patch) | |
tree | 86dc6458ac715713b822ccde4c1e7d03499410cc /bean | |
parent | 97f5f3aa728eb742f57d96d9ff61e9324d6620da (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 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 <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 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 <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" |