]>
Commit | Line | Data |
---|---|---|
165855ae ER |
1 | --- cyrus-imapd-2.3.14/makedepend/def.h~ 2008-04-04 15:46:47.000000000 +0300 |
2 | +++ cyrus-imapd-2.3.14/makedepend/def.h 2009-08-30 10:45:47.435735860 +0300 | |
3 | @@ -163,7 +163,7 @@ | |
4 | ||
5 | char *copy(); | |
6 | char *base_name(); | |
7 | -char *getline(); | |
8 | +char *cyrus_getline(); | |
9 | struct symtab *slookup(); | |
10 | struct symtab *isdefined(); | |
11 | struct symtab *fdefined(); | |
12 | --- cyrus-imapd-2.3.14/makedepend/main.c~ 2008-04-04 15:46:49.000000000 +0300 | |
13 | +++ cyrus-imapd-2.3.14/makedepend/main.c 2009-08-30 10:43:37.258890563 +0300 | |
14 | @@ -549,7 +549,7 @@ | |
15 | * Get the next line. We only return lines beginning with '#' since that | |
16 | * is all this program is ever interested in. | |
17 | */ | |
18 | -char *getline(filep) | |
19 | +char *cyrus_getline(filep) | |
20 | register struct filepointer *filep; | |
21 | { | |
22 | register char *p, /* walking pointer */ | |
23 | --- cyrus-imapd-2.3.14/makedepend/parse.c~ 2008-04-04 15:46:49.000000000 +0300 | |
24 | +++ cyrus-imapd-2.3.14/makedepend/parse.c 2009-08-30 10:44:33.088884798 +0300 | |
25 | @@ -83,7 +83,7 @@ | |
26 | register int type; | |
27 | boolean recfailOK; | |
28 | ||
29 | - while (line = getline(filep)) { | |
30 | + while (line = cyrus_getline(filep)) { | |
31 | switch(type = deftype(line, filep, file_red, file, TRUE)) { | |
32 | case IF: | |
33 | doif: | |
34 | @@ -205,7 +205,7 @@ | |
35 | register char *line; | |
36 | register int type; | |
37 | ||
38 | - while (line = getline(filep)) { | |
39 | + while (line = cyrus_getline(filep)) { | |
40 | switch(type = deftype(line, filep, file_red, file, FALSE)) { | |
41 | case IF: | |
42 | case IFFALSE: |