← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/mono-2.4-workaround.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-05-26 18:00:00 UTC
  • Revision ID: james.westby@ubuntu.com-20090526180000-t5otxzhj1rru5ovt
Tags: 1:3.1.0-3ubuntu2
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Correct path to splitgsi in convert2po.
* Disable gsi-export for Rosetta due to bug in localize.pl.
* Reenable building on sparc.
* Switch boost to 1.38.
* Resynchronise with ooo-build-3-1 (271b85e5ce6b601d75d0693b9c937d1eabd069dc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/mono-2.4-workaround.diff
 
1
--- cli_ure/source/mono_bridge/typedescription.cs.old   2009-04-15 12:24:38.000000000 +0200
 
2
+++ cli_ure/source/mono_bridge/typedescription.cs       2009-04-15 16:05:34.000000000 +0200
 
3
@@ -85,7 +85,7 @@ public unsafe struct TypeDescriptionRefe
 
4
     public uno.rtl.UString *               pTypeName;
 
5
     /** pointer to full typedescription; this value is only valid if the type is never swapped out
 
6
     */
 
7
-    public TypeDescription *               pType;
 
8
+    public void *                          pType;
 
9
     /** pointer to optimize the runtime; not for public use
 
10
     */
 
11
     public void *                          pUniqueIdentifier;
 
12
@@ -136,7 +136,7 @@ public unsafe struct TypeDescription
 
13
     public uno.rtl.UString *               pTypeName;
 
14
     /** pointer to self to distinguish reference from description; for internal use only
 
15
     */
 
16
-    public TypeDescription *               pSelf;
 
17
+    public void *                          pSelf;
 
18
     /** pointer to optimize the runtime; not for public use
 
19
     */
 
20
     public void *                          pUniqueIdentifier;
 
21