summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2009-03-07 13:31:29 +0100
committerSam Ravnborg <sam@ravnborg.org>2009-03-07 13:31:29 +0100
commitd15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 (patch)
treea26357ed3ccab528d345a2263f7b3a6dd53e6938
parent559595a985e106d2fa9f0c79b7f5805453fed593 (diff)
downloadlwn-d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7.tar.gz
lwn-d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7.zip
kbuild: fix C libary confusion in unifdef.c due to getline()
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>
-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;