summaryrefslogtreecommitdiffstats
path: root/extra/openoffice/ooo_getline.diff
blob: c9fac857c31fca0a6553e5f78b7c048f2c9d6031 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
--- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
+++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
@@ -154,7 +154,7 @@
 
 char			*copy();
 char			*base_name();
-char			*getline();
+char			*ooo_getline();
 char			*isdefined();
 struct filepointer	*getfile();
 struct inclist		*newinclude();
--- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
+++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
@@ -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 *ooo_getline(filep)
 	register struct filepointer	*filep;
 {
 	register char	*p,	/* walking pointer */
--- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
+++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
@@ -45,7 +45,7 @@
 	register int	type;
 	boolean recfailOK;
 
-	while ((line = getline(filep))) {
+	while ((line = ooo_getline(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 = ooo_getline(filep))) {
 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
 		case IF:
 		case IFFALSE: