summaryrefslogtreecommitdiffstats
path: root/test/openoffice/ooo_getline.diff
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-03-04 07:26:50 +0100
committertnut <thierryn1 at hispeed dot ch>2010-03-04 07:26:50 +0100
commite06fa863719e767d4eb3d2035e6718d79952cbcc (patch)
tree7be8aa6ddc6370ccefe2586ed1ce72debb93598b /test/openoffice/ooo_getline.diff
parentd1f50a6ce0d3ad4540268c8077fde2c3dd9caacb (diff)
downloadnutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.gz
nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.bz2
nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.xz
nutyx-extra-e06fa863719e767d4eb3d2035e6718d79952cbcc.zip
Maj openoffice#3.2.0-
Diffstat (limited to 'test/openoffice/ooo_getline.diff')
-rw-r--r--test/openoffice/ooo_getline.diff43
1 files changed, 0 insertions, 43 deletions
diff --git a/test/openoffice/ooo_getline.diff b/test/openoffice/ooo_getline.diff
deleted file mode 100644
index c9fac857c..000000000
--- a/test/openoffice/ooo_getline.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-
---- 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: