rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22140

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
Log Message:
new conflict

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:

Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	13 Feb 2009 12:15:19 -0000	1.2
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	12 Mar 2009 13:45:06 -0000	1.3
@@ -38,3 +38,51 @@
  #include "global.hxx"
  #include "document.hxx"
  #include "stlpool.hxx"
+Index: mkdepend/def.h
+===================================================================
+--- openoffice.org.orig/soltools/mkdepend/def.h	(revision 269360)
++++ openoffice.org/soltools/mkdepend/def.h	(working copy)
+@@ -154,7 +154,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*get_line();
+ char			*isdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+Index: mkdepend/main.c
+===================================================================
+--- openoffice.org/soltools/mkdepend/main.c	(revision 269360)
++++ openoffice.org.orig/soltools/mkdepend/main.c	(working copy)
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *get_line(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+Index: mkdepend/parse.c
+===================================================================
+--- openoffice.org.orig/soltools/mkdepend/parse.c	(revision 269360)
++++ openoffice.org/soltools/mkdepend/parse.c	(working copy)
+@@ -45,7 +45,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = get_line(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ 		case IF:
+ 		doif:
+@@ -168,7 +168,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = get_line(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ 		case IF:
+ 		case IFFALSE: