patches/uClibc/0.9.30.1/180-getline-conflict.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Mon Apr 16 15:25:36 2012 +0200 (2012-04-16)
changeset 2941 13e40098fffc
permissions -rw-r--r--
cc/gcc: update Linaro GCC revisions to 2012.04

Update Linaro GCC with the latest available revisions.

The 4.7 revision is also released, but the infrastructure is not yet ready for
it in CT-NG.

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
zdevai@1602
     1
--- a/extra/scripts/unifdef.c
zdevai@1602
     2
+++ b/extra/scripts/unifdef.c
zdevai@1602
     3
@@ -206,7 +206,7 @@
zdevai@1602
     4
 static void             error(const char *);
zdevai@1602
     5
 static int              findsym(const char *);
zdevai@1602
     6
 static void             flushline(bool);
zdevai@1602
     7
-static Linetype         getline(void);
zdevai@1602
     8
+static Linetype         get_line(void);
zdevai@1602
     9
 static Linetype         ifeval(const char **);
zdevai@1602
    10
 static void             ignoreoff(void);
zdevai@1602
    11
 static void             ignoreon(void);
zdevai@1602
    12
@@ -512,7 +512,7 @@
zdevai@1602
    13
zdevai@1602
    14
 	for (;;) {
zdevai@1602
    15
 		linenum++;
zdevai@1602
    16
-		lineval = getline();
zdevai@1602
    17
+		lineval = get_line();
zdevai@1602
    18
 		trans_table[ifstate[depth]][lineval]();
zdevai@1602
    19
 		debug("process %s -> %s depth %d",
zdevai@1602
    20
 		    linetype_name[lineval],
zdevai@1602
    21
@@ -526,7 +526,7 @@
zdevai@1602
    22
  * help from skipcomment().
zdevai@1602
    23
  */
zdevai@1602
    24
 static Linetype
zdevai@1602
    25
-getline(void)
zdevai@1602
    26
+get_line(void)
zdevai@1602
    27
 {
zdevai@1602
    28
 	const char *cp;
zdevai@1602
    29
 	int cursym;
zdevai@1602
    30