aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-11-28 22:25:26 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-11-28 22:25:26 +0000
commit4a23c7a92cc675f73a91bed72ee031cfdd4eb8c9 (patch)
tree9de34972b1ef5b051344f02447e057736968bab9 /target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
parent2ee2679ac97098e9cf394ca4e78d2cc6ac5fad85 (diff)
downloadupstream-4a23c7a92cc675f73a91bed72ee031cfdd4eb8c9.tar.gz
upstream-4a23c7a92cc675f73a91bed72ee031cfdd4eb8c9.tar.bz2
upstream-4a23c7a92cc675f73a91bed72ee031cfdd4eb8c9.zip
Some build fixes.
SVN-Revision: 18590
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch b/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
new file mode 100644
index 0000000000..0a68134f7a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
@@ -0,0 +1,29 @@
+--- a/scripts/unifdef.c
++++ b/scripts/unifdef.c
+@@ -206,7 +206,7 @@ static void done(void);
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype get_line(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@ process(void)
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = get_line();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@ process(void)
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++get_line(void)
+ {
+ const char *cp;
+ int cursym;