>From 291e6880ab7f2f21f532ec4ba6a5f0510b60cb26 Mon Sep 17 00: 00:00 2001
From: Pascal Stumpf <pascal.stu...@cubes.de>
Subject: [PATCH] Rename getline() to not conflict with the standard POSIX
interface of the same name.
To: cdesktopenv-devel@lists.sourceforge.net
Date: Thu, 09 Aug 2012 21:35:12 +0200
---
cde/config/makedepend/def.h | 2 +-
cde/config/makedepend/main.c | 2 +-
cde/config/makedepend/parse.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h
index 85ef815..1678222 100644
--- a/cde/config/makedepend/def.h
+++ b/cde/config/makedepend/def.h
@@ -150,7 +150,7 @@ char *realloc();
char *copy();
char *base_name();
-char *getline();
+char *our_getline();
struct symtab **slookup();
struct symtab **isdefined();
struct symtab **fdefined();
diff --git a/cde/config/makedepend/main.c b/cde/config/makedepend/main.c
index 631eded..ae67ecb 100644
--- a/cde/config/makedepend/main.c
+++ b/cde/config/makedepend/main.c
@@ -499,7 +499,7 @@ match(str, list)
* Get the next line. We only return lines beginning with '#' since that
* is all this program is ever interested in.
*/
-char *getline(filep)
+char *our_getline(filep)
register struct filepointer *filep;
{
register char *p, /* walking pointer */
diff --git a/cde/config/makedepend/parse.c b/cde/config/makedepend/parse.c
index bad3fcf..07153be 100644
--- a/cde/config/makedepend/parse.c
+++ b/cde/config/makedepend/parse.c
@@ -56,7 +56,7 @@ gobble(filep, file, file_red)
register char *line;
register int type;
- while (line = getline(filep)) {
+ while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, FALSE)) {
case IF:
case IFFALSE:
@@ -544,7 +544,7 @@ find_includes(filep, file, file_red, recursion, failOK)
register int type;
boolean recfailOK;
- while (line = getline(filep)) {
+ while (line = our_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, TRUE)) {
case IF:
doif:
--
1.7.6
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
