patches/uClibc/0.9.30.1/180-getline-conflict.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
branch1.17
changeset 3129 b8e00eab8f81
permissions -rw-r--r--
scripts: fail on ':' in paths

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536
(transplanted from 15cd5dc25929d0ccd0e1f187fe721a1ca0d48919)
     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