Mercurial > hg > aboriginal
changeset 795:c1bf33329d1f
Fix bug that hits Fedora 11: uClibc copied some kernel code that got fixed upstream at http://patchwork.kernel.org/patch/33547/
author | Rob Landley <rob@landley.net> |
---|---|
date | Fri, 07 Aug 2009 13:08:59 -0500 |
parents | 81cf7ae7afce |
children | 5f793a1ca658 |
files | sources/patches/uClibc-fix-getline.patch |
diffstat | 1 files changed, 53 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/uClibc-fix-getline.patch Fri Aug 07 13:08:59 2009 -0500 @@ -0,0 +1,53 @@ +From: Justin P. Mattock <justinmattock@gmail.com> + +commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 upstream (linux kernel). + +This fixes an error when compiling the kernel. + + CHK include/linux/version.h + HOSTCC scripts/unifdef +scripts/unifdef.c:209: error: conflicting types for 'getline' +/usr/include/stdio.h:651: note: previous declaration of 'getline' was here +make[1]: *** [scripts/unifdef] Error 1 +make: *** [__headers] Error 2 + +Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> +Cc: Frederic Weisbecker <fweisbec@gmail.com> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Sam Ravnborg <sam@ravnborg.org> +Cc: Gilles Espinasse <g.esp@free.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +-- + scripts/unifdef.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/extra/scripts/unifdef.c ++++ b/extra/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;