[PATCH] Fix cptoqe build
François Revol <[email protected]> Mon, 06 Jan 2014 12:22:26 +0100
| Newsgroups | gmane.editors.qemacs.devel |
|---|---|
| Message-ID | <[email protected]> |
gcc -O2 -Wall -g -O2 -funsigned-char -Wno-format-zero-length
-I./libqhtml -o cptoqe cptoqe.c cutils.c
cptoqe.c:42:14: error: conflicting types for ‘getline’
static char *getline(char *buf, int buf_size, FILE *f, int strip_comments)
^
In file included from cptoqe.c:23:0:
/usr/include/stdio.h:678:20: note: previous declaration of ‘getline’ was
here
extern _IO_ssize_t getline (char **__restrict __lineptr,
^
François.
_______________________________________________
Qemacs-devel mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/qemacs-devel
qemacs-cptoqe.diff
(text/x-patch, 1 KB)
Index: cptoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/cptoqe.c,v
retrieving revision 1.14
diff -u -r1.14 cptoqe.c
--- cptoqe.c 2 May 2008 16:04:09 -0000 1.14
+++ cptoqe.c 6 Jan 2014 11:20:02 -0000
@@ -39,7 +39,7 @@
return p;
}
-static char *getline(char *buf, int buf_size, FILE *f, int strip_comments)
+static char *getaline(char *buf, int buf_size, FILE *f, int strip_comments)
{
for (;;) {
char *p;
@@ -96,7 +96,7 @@
nb = 0;
for (;;) {
- if (!(p = getline(line, sizeof(line), f, 0))
+ if (!(p = getaline(line, sizeof(line), f, 0))
|| *p == '['
|| !strcasecmp(p, "# compatibility")) {
if (f == f0)
@@ -273,7 +273,7 @@
f = fopen(indexname, "r");
if (f != NULL) {
- while (getline(line, sizeof(line), f, 1)) {
+ while (getaline(line, sizeof(line), f, 1)) {
if (*line == '[' && line[1 + len] == ']'
&& !namecmp(line + 1, name, len)) {
return f;