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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
http://bugs.gentoo.org/274352
Fix build failure with glibc-2.10
--- jove4.16.0.70-orig/insert.c
+++ jove4.16.0.70/insert.c
@@ -504,7 +504,7 @@
atchar = 0;
}
- getline(atline->l_dline, genbuf);
+ get_line(atline->l_dline, genbuf);
atchar += tchar;
linecopy(genbuf, atchar, save);
atline->l_dline = putline(genbuf);
--- jove4.16.0.70-orig/io.c
+++ jove4.16.0.70/io.c
@@ -1347,9 +1347,9 @@
void
#ifdef USE_PROTOTYPES
-getline proto((daddr addr, register char *buf))
+get_line proto((daddr addr, register char *buf))
#else
-getline(addr, buf)
+get_line(addr, buf)
daddr addr;
register char *buf;
#endif
--- jove4.16.0.70-orig/io.h
+++ jove4.16.0.70/io.h
@@ -40,7 +40,7 @@
close_file proto((File *fp)),
d_cache_init proto((void)),
file_write proto((char *fname, bool app)),
- getline proto((daddr addr, char *buf)),
+ get_line proto((daddr addr, char *buf)),
lsave proto((void)),
putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
read_file proto((char *file, bool is_insert)),
--- jove4.16.0.70-orig/recover.c
+++ jove4.16.0.70/recover.c
@@ -165,7 +165,7 @@
private char *getblock proto((daddr atl));
void
-getline(tl, buf)
+get_line(tl, buf)
daddr tl;
char *buf;
{
@@ -580,7 +580,7 @@
Nchars = Nlines = 0L;
while (--nlines >= 0) {
addr = getaddr(ptrs_fp);
- getline(addr, buf);
+ get_line(addr, buf);
Nlines += 1;
Nchars += 1 + strlen(buf);
fputs(buf, out);
--- jove4.16.0.70-orig/util.c
+++ jove4.16.0.70/util.c
@@ -280,7 +280,7 @@
strcpy(buf, linebuf);
Jr_Len = strlen(linebuf);
} else
- getline(line->l_dline, buf);
+ get_line(line->l_dline, buf);
return buf;
}
--- jove4.16.0.70-orig/util.h
+++ jove4.16.0.70/util.h
@@ -18,7 +18,7 @@
#define eobp() (lastp(curline) && eolp())
#define eolp() (linebuf[curchar] == '\0')
#define firstp(line) ((line) == curbuf->b_first)
-#define getDOT() getline(curline->l_dline, linebuf)
+#define getDOT() get_line(curline->l_dline, linebuf)
#define lastp(line) ((line) == curbuf->b_last)
extern UnivPtr
|
GitWeb