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
|
--- vnc-3.3.3r2.orig/Xvnc/config/makedepend/def.h
+++ vnc-3.3.3r2/Xvnc/config/makedepend/def.h
@@ -137,7 +137,7 @@
char *copy();
char *base_name();
-char *getline();
+char *x_getline();
struct symtab **slookup();
struct symtab **isdefined();
struct symtab **fdefined();
--- vnc-3.3.3r2.orig/Xvnc/config/makedepend/main.c
+++ vnc-3.3.3r2/Xvnc/config/makedepend/main.c
@@ -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 *x_getline(filep)
register struct filepointer *filep;
{
register char *p, /* walking pointer */
--- vnc-3.3.3r2.orig/Xvnc/config/makedepend/parse.c
+++ vnc-3.3.3r2/Xvnc/config/makedepend/parse.c
@@ -40,7 +40,7 @@
register char *line;
register int type;
- while (line = getline(filep)) {
+ while (line = x_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, FALSE)) {
case IF:
case IFFALSE:
@@ -529,7 +529,7 @@
register int type;
boolean recfailOK;
- while (line = getline(filep)) {
+ while (line = x_getline(filep)) {
switch(type = deftype(line, filep, file_red, file, TRUE)) {
case IF:
doif:
|
GitWeb
