./packages/openofficeorg/3.2/unstable r1876: one more linuxaxp01.diff update, but for hppa
------------------------------------------------------------
revno: 1876
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-22 18:45:50 +0100
message:
one more linuxaxp01.diff update, but for hppa
modified:
patches/cws-linuxaxp01.diff
=== modified file 'patches/cws-linuxaxp01.diff'
--- a/patches/cws-linuxaxp01.diff 2010-03-21 23:25:04 +0000
+++ b/patches/cws-linuxaxp01.diff 2010-03-22 17:45:50 +0000
@@ -36,7 +36,7 @@
libwpd-testing.diff
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/cws-linuxaxp01.diff 2010-03-18 17:45:45.000000000 +0100
-@@ -0,0 +1,1916 @@
+@@ -0,0 +1,1955 @@
+diff -r f387649cb501 automation/source/testtool/objtest.cxx
+--- automation/source/testtool/objtest.cxx Fri Mar 12 15:32:45 2010 +0100
++++ automation/source/testtool/objtest.cxx Mon Mar 15 16:00:09 2010 +0000
@@ -1953,3 +1953,42 @@
+ ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC"));
+ else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64)))
+
++
++# HG changeset patch
++# User Caolán McNamara <cmc@openoffice.org>
++# Date 1269100207 0
++# Node ID 8c4d9c55f482e09a6e9053520e9ea5e9e62ab0af
++# Parent 33875dd3d07bb185d0d8d6cb570ecc8f4241d53c
++linuxaxp01: #i110145# hppa bridge used uninit value and ludicrous logic
++
++diff -r 33875dd3d07b -r 8c4d9c55f482 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
++--- bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx Fri Mar 19 14:44:49 2010 +0000
+++++ bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx Sat Mar 20 15:50:07 2010 +0000
++@@ -61,7 +61,7 @@
++ long r8, void ** gpreg, double *fpreg, void ** ovrflw,
++ sal_Int64 * pRegisterReturn /* space for register return */ )
++ {
++- void ** startovrflw;
+++ void ** startovrflw = ovrflw;
++ int nregs = 0; //number of words passed in registers
++
++ #ifdef CMC_DEBUG
++@@ -143,7 +143,7 @@
++ }
++ else
++ {
++- if ((startovrflw-ovrflw) & 4)
+++ if ((startovrflw-ovrflw) & 1)
++ ovrflw--;
++ pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw - 4);
++ bOverFlowUsed = true;
++@@ -182,7 +182,7 @@
++ }
++ else
++ {
++- if ((startovrflw-ovrflw) & 4)
+++ if ((startovrflw-ovrflw) & 1)
++ ovrflw--;
++ pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw - 4);
++ bOverFlowUsed = true;
++
Reply to: