[coldfire]: remove 2.6.25 support
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.25 / 30-fix_conflicting_getline.patch
1 --- a/scripts/unifdef.c
2 +++ b/scripts/unifdef.c
3 @@ -206,7 +206,7 @@ static void done(void);
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 @@ process(void)
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 @@ process(void)
22 * help from skipcomment().
23 */
24 static Linetype
25 -getline(void)
26 +get_line(void)
27 {
28 const char *cp;
29 int cursym;