From 8a03a7c06410a294d0f082f7a9a2df3b2ae742b3 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 4 Oct 2007 07:13:20 +0000 Subject: INTEGRATION: CWS pmladek06 (1.5.28); FILE MERGED 2007/09/11 12:00:07 pmladek 1.5.28.1: #i81385# fixes build with IBM Java 1.5.0 on PPC; syntax error in jni.h --- bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 8 ++++---- bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 6 +++--- 2 files changed, 7 insertions(+), 7 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 9676c1e1da42..91276e1a99a3 100644 --- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c @@ -4,9 +4,9 @@ * * $RCSfile: com_sun_star_beans_LocalOfficeWindow.c,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2006-06-19 20:03:11 $ + * last change: $Author: rt $ $Date: 2007-10-04 08:13:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,10 +38,10 @@ #include #include "jni.h" -#include "jawt.h" #include "jawt_md.h" +#include "jawt.h" -//#include "../inc/com_sun_star_comp_beans_LocalOfficeWindow.h" +/*#include "../inc/com_sun_star_comp_beans_LocalOfficeWindow.h"*/ #if defined assert #undef assert 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 445c243adf21..007b5dc19214 100644 --- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -4,9 +4,9 @@ * * $RCSfile: com_sun_star_comp_beans_LocalOfficeWindow.c,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2006-06-19 20:03:23 $ + * last change: $Author: rt $ $Date: 2007-10-04 08:13:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,8 +38,8 @@ #include #include "jni.h" -#include "jawt.h" #include "jawt_md.h" +#include "jawt.h" #define SYSTEM_WIN32 1 -- cgit