From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Date: Wed, 13 May 2009 20:50:12 +0300 From: Michael Shigorin To: devel@lists.altlinux.org Message-ID: <20090513175012.GV15370@osdn.org.ua> Mail-Followup-To: devel@lists.altlinux.org, solo@altlinux.org References: <20090507204438.C4C9A151C4AB@granary.armor.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="lIrNkN/7tmsD/ALM" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20090507204438.C4C9A151C4AB@granary.armor.altlinux.org> User-Agent: Mutt/1.4.2.1i Cc: solo@altlinux.org Subject: Re: [devel] apache-1.3.41rusPL30.23-alt6: Sisyphus/i586 test rebuild failed X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2009 17:50:28 -0000 Archived-At: List-Archive: List-Post: --lIrNkN/7tmsD/ALM Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit On Fri, May 08, 2009 at 12:44:38AM +0400, QA Team Robot wrote: > Package: apache-1.3.41rusPL30.23-alt6 > htpasswd.c:101: error: conflicting types for 'getline' > /usr/include/stdio.h:653: note: previous declaration of 'getline' was here Лёш, достаточно переименовать этот скорее всего внутренний getline() во что-то ещё, как сделали в ядре и ряде других мест. -- ---- WBR, Michael Shigorin ------ Linux.Kiev http://www.linux.kiev.ua/ --lIrNkN/7tmsD/ALM Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="strongswan-4.2.14-alt-glibc29.patch" diff -Naur strongswan-4.2.14-orig/src/libfreeswan/optionsfrom.c strongswan-4.2.14/src/libfreeswan/optionsfrom.c --- strongswan-4.2.14-orig/src/libfreeswan/optionsfrom.c 2008-12-23 06:24:06 +0000 +++ strongswan-4.2.14/src/libfreeswan/optionsfrom.c 2009-05-13 14:29:08 +0000 @@ -31,7 +31,7 @@ static const char *dowork(const char *, int *, char ***, int); static const char *getanarg(FILE *, struct work *, char **); -static char *getline(FILE *, char *, size_t); +static char *parseline(FILE *, char *, size_t); /* - optionsfrom - add some options, taken from a file, to argc/argv @@ -149,7 +149,7 @@ char *endp; while (w->pending == NULL) { /* no pending line */ - if ((w->line = getline(f, w->buf, sizeof(w->buf))) == NULL) + if ((w->line = parseline(f, w->buf, sizeof(w->buf))) == NULL) return "error in line read"; /* caller checks EOF */ if (w->line[0] != '#' && *(w->line + strspn(w->line, " \t")) != '\0') @@ -171,7 +171,7 @@ if (*linep == NULL) return "out of memory for new line"; strcpy(*linep, p); - } else /* getline already malloced it */ + } else /* parseline already malloced it */ *linep = p; return NULL; } @@ -203,10 +203,10 @@ } /* - - getline - read a line from the file, trim newline off + - parseline - read a line from the file, trim newline off */ static char * /* pointer to line, NULL for eof/error */ -getline(f, buf, bufsize) +parseline(f, buf, bufsize) FILE *f; char *buf; /* buffer to use, if convenient */ size_t bufsize; /* size of buf */ --lIrNkN/7tmsD/ALM--