57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
|
From d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Justin P. Mattock <justinmattock@gmail.com>
|
||
|
|
Date: Sat, 7 Mar 2009 13:31:29 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
scripts/unifdef.c | 6 +++---
|
||
|
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
|
||
|
|
index 552025e..05a31a6 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;
|
||
|
|
--
|
||
|
|
1.6.3.3
|
||
|
|
|