patches/uClibc/0.9.30.1/180-getline-conflict.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Mon Mar 12 21:19:26 2012 +0100 (2012-03-12)
branch1.13
changeset 2913 ce1a9c264de5
permissions -rw-r--r--
debug/strace: fix download URL

strace upstream location has slightly changed.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
(transplanted from cc170c96362c5e12d407558042f6fc17ead43f75)
     1 --- a/extra/scripts/unifdef.c
     2 +++ b/extra/scripts/unifdef.c
     3 @@ -206,7 +206,7 @@
     4  static void             error(const char *);
     5  static int              findsym(const char *);
     6  static void             flushline(bool);
     7 -static Linetype         getline(void);
     8 +static Linetype         get_line(void);
     9  static Linetype         ifeval(const char **);
    10  static void             ignoreoff(void);
    11  static void             ignoreon(void);
    12 @@ -512,7 +512,7 @@
    13 
    14  	for (;;) {
    15  		linenum++;
    16 -		lineval = getline();
    17 +		lineval = get_line();
    18  		trans_table[ifstate[depth]][lineval]();
    19  		debug("process %s -> %s depth %d",
    20  		    linetype_name[lineval],
    21 @@ -526,7 +526,7 @@
    22   * help from skipcomment().
    23   */
    24  static Linetype
    25 -getline(void)
    26 +get_line(void)
    27  {
    28  	const char *cp;
    29  	int cursym;
    30