ooo-build r11818 - trunk/patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Mar  5 22:38:29 2008
New Revision: 11818
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11818&view=rev

Log:
fixup

Modified:
   trunk/patches/src680/cws-s390port01.diff

Modified: trunk/patches/src680/cws-s390port01.diff
==============================================================================
--- trunk/patches/src680/cws-s390port01.diff	(original)
+++ trunk/patches/src680/cws-s390port01.diff	Wed Mar  5 22:38:29 2008
@@ -274,11 +274,11 @@
 ===================================================================
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx,v
 retrieving revision 1.4
-retrieving revision 1.4.92.1
-diff -u -u -p -b -w -B -r1.4 -r1.4.92.1
+retrieving revision 1.4.92.2
+diff -u -u -p -b -w -B -r1.4 -r1.4.92.2
 --- bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	16 Sep 2006 15:48:49 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	29 Feb 2008 14:56:00 -0000	1.4.92.1
-@@ -36,34 +36,27 @@
++++ bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	4 Mar 2008 10:14:37 -0000	1.4.92.2
+@@ -36,34 +36,26 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_bridges.hxx"
  
@@ -303,7 +303,7 @@
 +#include <stdio.h>
 +#include <string.h>
  
- 
+-
 -using namespace ::osl;
 -using namespace ::rtl;
  using namespace ::com::sun::star::uno;
@@ -843,10 +843,10 @@
 ===================================================================
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx,v
 retrieving revision 1.5
-retrieving revision 1.5.92.1
-diff -u -u -p -b -w -B -r1.5 -r1.5.92.1
+retrieving revision 1.5.92.3
+diff -u -u -p -b -w -B -r1.5 -r1.5.92.3
 --- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	16 Sep 2006 15:49:02 -0000	1.5
-+++ bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	29 Feb 2008 14:56:00 -0000	1.5.92.1
++++ bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	4 Mar 2008 19:49:29 -0000	1.5.92.3
 @@ -37,6 +37,7 @@
  #include "precompiled_bridges.hxx"
  
@@ -860,11 +860,11 @@
  #include <osl/mutex.hxx>
  
 -#include <bridges/cpp_uno/bridge.hxx>
-+#include <com/sun/star/uno/bridges/cpp_uno/bridge.hxx>
++#include <com/sun/star/uno/genfunc.hxx>
  #include <typelib/typedescription.hxx>
  #include <uno/any2.h>
  
-@@ -291,4 +292,4 @@
+@@ -291,4 +292,4 @@ void fillUnoException( __cxa_exception *
  }
  
  }