diff options
Diffstat (limited to 'editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx')
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx b/editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx index 1e88b4c4dda4..6d562f031983 100644 --- a/editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx +++ b/editors/openoffice.org-3-devel/files/patch-transex3+source+xmlparse.cxx @@ -1,29 +1,20 @@ -#iZ XXXX +http://www.openoffice.org/issues/show_bug.cgi?id=40184 -FreeBSD doesn't have alloca.h, and -builtin alloca is defined at stdlib.h. +FreeBSD doesn't have alloca.h -Index: transex3/source/xmlparse.cxx +Index: source/xmlparse.cxx =================================================================== RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v -retrieving revision 1.2 -diff -u -r1.2 xmlparse.cxx ---- transex3/source/xmlparse.cxx 30 Aug 2004 17:31:58 -0000 1.2 -+++ transex3/source/xmlparse.cxx 3 Oct 2004 08:41:45 -0000 -@@ -64,11 +64,12 @@ - - - #include <stdio.h> --#ifdef WIN32 --#include <malloc.h> -+ -+#if defined(SOLARIS) || defined(IRIX) -+ #include <alloca.h> +retrieving revision 1.5 +diff -u -r1.5 xmlparse.cxx +--- transex3/source/xmlparse.cxx 18 Nov 2004 08:17:50 -0000 1.5 ++++ transex3/source/xmlparse.cxx 8 Jan 2005 02:56:14 -0000 +@@ -67,7 +67,7 @@ + #ifdef WIN32 + #include <malloc.h> #else -#ifndef MACOSX --#include <alloca.h> +#if !(defined(MACOSX) || defined(FREEBSD)) -+ #include <malloc.h> + #include <alloca.h> #endif #endif - |