rpms/openoffice.org/devel openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, 1.1, 1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 18 08:41:16 UTC 2007


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17250

Modified Files:
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
Log Message:
better x86_64 support

openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch:
 osl/unx/signal.c     |    0 
 sal/osl/unx/signal.c |  113 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 102 insertions(+), 11 deletions(-)

Index: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch	16 Apr 2007 10:06:28 -0000	1.1
+++ openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch	18 Apr 2007 08:41:13 -0000	1.2
@@ -4,7 +4,7 @@
 retrieving revision 1.32.14.1
 diff -u -r1.32.14.1 signal.c
 --- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
-+++ openoffice.org/sal/osl/unx/signal.c	15 Apr 2007 15:55:35 -0000
++++ openoffice.org/sal/osl/unx/signal.c	18 Apr 2007 08:37:08 -0000
 @@ -41,6 +41,7 @@
  
  #ifdef LINUX
@@ -22,13 +22,13 @@
 +typedef struct
 +{
 +    const char *name;
-+    Elf32_Off offset;
++    ElfW(Off) offset;
 +} dynamic_entry;
 +
 +static int
 +callback(struct dl_phdr_info *info, size_t size, void *data)
 +{
-+    const Elf32_Phdr* pDynamic = NULL;
++    const ElfW(Phdr) *pDynamic = NULL;
 +
 +    if (size == sizeof(struct dl_phdr_info))
 +    {
@@ -84,7 +84,7 @@
 + *
 + * cmc at openoffice.org
 + */
-+static Elf32_Off
++static ElfW(Off)
 +dynamic_section_offset(const char *name)
 +{
 +    dynamic_entry entry;




More information about the fedora-cvs-commits mailing list