2009-09-14 03:59:30

by Nitin Gupta

Subject: [PATCH] [mmotm] change "getline" to "get_line" to avoid C library confusion

Reintroduce this change to fix compilation error on mmotm.
(Original change by Justin P. Mattock)

Signed-off-by: Nitin Gupta <[email protected]>
---
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;

2009-09-14 22:24:57

by Andrew Morton

Subject: Re: [PATCH] [mmotm] change "getline" to "get_line" to avoid C library confusion

On Mon, 14 Sep 2009 09:29:30 +0530
Nitin Gupta <[email protected]> wrote:

> Reintroduce this change to fix compilation error on mmotm.
> (Original change by Justin P. Mattock)
>
> Signed-off-by: Nitin Gupta <[email protected]>
> ---
> 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;


I'm all confused again. This:

commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7
Author: Justin P. Mattock <[email protected]>
AuthorDate: Sat Mar 7 13:31:29 2009 +0100
Commit: Sam Ravnborg <[email protected]>
CommitDate: Sat Mar 7 13:31:29 2009 +0100

kbuild: fix C libary confusion in unifdef.c due to getline()

went into mainline months ago and afaict nothing has subsequently
changed in that area?

2009-09-15 02:58:38

by Nitin Gupta

Subject: Re: [PATCH] [mmotm] change "getline" to "get_line" to avoid C library confusion

On 09/15/2009 03:54 AM, Andrew Morton wrote:
> On Mon, 14 Sep 2009 09:29:30 +0530
> Nitin Gupta<[email protected]> wrote:
>
>> Reintroduce this change to fix compilation error on mmotm.
>> (Original change by Justin P. Mattock)


>
> I'm all confused again. This:
>
> commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7
> Author: Justin P. Mattock<[email protected]>
> AuthorDate: Sat Mar 7 13:31:29 2009 +0100
> Commit: Sam Ravnborg<[email protected]>
> CommitDate: Sat Mar 7 13:31:29 2009 +0100
>
> kbuild: fix C libary confusion in unifdef.c due to getline()
>
> went into mainline months ago and afaict nothing has subsequently
> changed in that area?
>
>

This is already fixed in mainline but this patch is for mmotm. On mmotm,
this change is not present. So, I'm now having compilation error while
compiling mmotm tree (not mainline):

mmotm/scripts/unifdef.c:209: error: conflicting types for ?getline?
/usr/include/stdio.h:653: note: previous declaration of ?getline? was here
make[3]: *** [scripts/unifdef] Error 1
make[2]: *** [__headers] Error 2
make[1]: *** [vmlinux] Error 2
make: *** [sub-make] Error 2


Thanks,
Nitin