diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 15:06:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 15:06:03 +0000 |
| commit | f66f31c2676d00e8b6497224b50468ad9ec82178 (patch) | |
| tree | 81c23f3646a8c6b351bcd225dcc875424c934a90 /bridges | |
| parent | INTEGRATION: CWS s390port01 (1.4.92); FILE MERGED (diff) | |
| download | core-f66f31c2676d00e8b6497224b50468ad9ec82178.tar.gz core-f66f31c2676d00e8b6497224b50468ad9ec82178.zip | |
INTEGRATION: CWS s390port01 (1.5.92); FILE MERGED
2008/03/04 19:49:29 rene 1.5.92.3: consistency with other files
2008/03/04 10:14:37 rene 1.5.92.2: #i10000# two missing #include <string.h>'s for g++ 4.3
2008/02/29 14:56:00 cmc 1.5.92.1: #i86425# fix up s390
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx index 16bee7ff3b05..600b9f8171d6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx @@ -4,9 +4,9 @@ * * $RCSfile: except.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:49:02 $ + * last change: $Author: vg $ $Date: 2008-03-18 16:06:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,6 +37,7 @@ #include "precompiled_bridges.hxx" #include <stdio.h> +#include <string.h> #include <dlfcn.h> #include <cxxabi.h> #include <hash_map> @@ -46,7 +47,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> @@ -291,4 +292,4 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p } } - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ |