diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 11:40:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 11:40:19 +0000 |
| commit | d7eae0931884e40059d73ccf80bda5174f601bb1 (patch) | |
| tree | b8877fc7aa2f4b53b7fa87180050fae91dbd75cc /bridges | |
| parent | 11e1a58c7c8aefabaebb6124980b68951dbedd20 (diff) | |
INTEGRATION: CWS sb10 (1.4.52); FILE MERGED
2004/01/17 18:40:44 khendricks 1.4.52.1: Stephan,
I am adding in the new ppc linux bridge code to your branch
in the hopes it will get merged in when your branch
tag is merged in
it passes the multinherit tests in all forms
I will try to fix the MacOSX stuff next.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx index 0c07db211e72..f6147ce4c674 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx @@ -2,9 +2,9 @@ * * $RCSfile: except.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:26:17 $ + * last change: $Author: hr $ $Date: 2004-02-03 12:40:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,7 +69,7 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> -#include <bridges/cpp_uno/bridge.hxx> +#include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> |