summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2009-03-07 13:31:29 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-02 16:32:13 -0700
commite14c0aba2cb65b75a34dc0355e1ec9d90c0b3e35 (patch)
tree784e39b72a8f34501f3b0ba4b08811d04d161b0c
parent339d06aaa1aff1ac0d73987ec4f90836aac62d76 (diff)
kbuild: fix C libary confusion in unifdef.c due to getline()
commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 upstream. 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>
-rw-r--r--scripts/unifdef.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 552025e72acb..05a31a6c7e1b 100644
--- 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;