* [PATCH] scripts/unifdef.c: rename getline symbol to something else
@ 2009-03-11 16:17 Kyle McMartin
2009-03-11 18:37 ` Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: Kyle McMartin @ 2009-03-11 16:17 UTC (permalink / raw)
To: linux-kernel; +Cc: sam, jakub, linux-kbuild
From: Kyle McMartin <kyle@redhat.com>
Rawhide builds are currently failing to build unifdef.c, as the next
version of glibc changes the default _POSIX_C_SOURCE level, which
exposes getline() from <stdio.h>
scripts/unifdef.c:209: error: conflicting types for 'getline'
/usr/include/stdio.h:653: note: previous declaration of 'getline' was
here
make[2]: *** [scripts/unifdef] Error 1
make[1]: *** [__headers] Error 2
make: *** [vmlinux] Error 2
Rename the symbol in unifdef.c to parseline to avoid this conflicting
declaration.
Otherwise Jakub says we could add a -D_POSIX_C_SOURCE=200112L as a
workaround to unifdef CFLAGS, but this seems like it would be less
desirable in the long term.
Signed-off-by: Kyle McMartin <kyle@redhat.com>
---
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 552025e..977e682 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 parseline(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 = parseline();
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)
+parseline(void)
{
const char *cp;
int cursym;
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] scripts/unifdef.c: rename getline symbol to something else
2009-03-11 16:17 [PATCH] scripts/unifdef.c: rename getline symbol to something else Kyle McMartin
@ 2009-03-11 18:37 ` Sam Ravnborg
2009-03-11 18:59 ` Kyle McMartin
0 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2009-03-11 18:37 UTC (permalink / raw)
To: Kyle McMartin; +Cc: linux-kernel, jakub, linux-kbuild
On Wed, Mar 11, 2009 at 12:17:33PM -0400, Kyle McMartin wrote:
> From: Kyle McMartin <kyle@redhat.com>
>
> Rawhide builds are currently failing to build unifdef.c, as the next
> version of glibc changes the default _POSIX_C_SOURCE level, which
> exposes getline() from <stdio.h>
>
> scripts/unifdef.c:209: error: conflicting types for 'getline'
> /usr/include/stdio.h:653: note: previous declaration of 'getline' was
> here
> make[2]: *** [scripts/unifdef] Error 1
> make[1]: *** [__headers] Error 2
> make: *** [vmlinux] Error 2
>
> Rename the symbol in unifdef.c to parseline to avoid this conflicting
> declaration.
I have a similar patch queued in kbuild-fixes.git.
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scripts/unifdef.c: rename getline symbol to something else
2009-03-11 18:37 ` Sam Ravnborg
@ 2009-03-11 18:59 ` Kyle McMartin
2009-03-12 6:56 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Kyle McMartin @ 2009-03-11 18:59 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Kyle McMartin, linux-kernel, jakub, linux-kbuild
On Wed, Mar 11, 2009 at 07:37:35PM +0100, Sam Ravnborg wrote:
> > Rawhide builds are currently failing to build unifdef.c, as the next
> > version of glibc changes the default _POSIX_C_SOURCE level, which
> > exposes getline() from <stdio.h>
> >
> > scripts/unifdef.c:209: error: conflicting types for 'getline'
> > /usr/include/stdio.h:653: note: previous declaration of 'getline' was
> > here
> > make[2]: *** [scripts/unifdef] Error 1
> > make[1]: *** [__headers] Error 2
> > make: *** [vmlinux] Error 2
> >
> > Rename the symbol in unifdef.c to parseline to avoid this conflicting
> > declaration.
>
> I have a similar patch queued in kbuild-fixes.git.
>
Great, thanks. Is this going to go into the next -rc?
regards, Kyle
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scripts/unifdef.c: rename getline symbol to something else
2009-03-11 18:59 ` Kyle McMartin
@ 2009-03-12 6:56 ` Andrew Morton
2009-03-13 5:52 ` Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2009-03-12 6:56 UTC (permalink / raw)
To: Kyle McMartin; +Cc: Sam Ravnborg, linux-kernel, jakub, linux-kbuild
On Wed, 11 Mar 2009 14:59:42 -0400 Kyle McMartin <kyle@infradead.org> wrote:
> On Wed, Mar 11, 2009 at 07:37:35PM +0100, Sam Ravnborg wrote:
> > > Rawhide builds are currently failing to build unifdef.c, as the next
> > > version of glibc changes the default _POSIX_C_SOURCE level, which
> > > exposes getline() from <stdio.h>
> > >
> > > scripts/unifdef.c:209: error: conflicting types for 'getline'
> > > /usr/include/stdio.h:653: note: previous declaration of 'getline' was
> > > here
> > > make[2]: *** [scripts/unifdef] Error 1
> > > make[1]: *** [__headers] Error 2
> > > make: *** [vmlinux] Error 2
> > >
> > > Rename the symbol in unifdef.c to parseline to avoid this conflicting
> > > declaration.
> >
> > I have a similar patch queued in kbuild-fixes.git.
> >
>
> Great, thanks. Is this going to go into the next -rc?
>
I was going to put it into 2.6.29 but Sam stole it :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scripts/unifdef.c: rename getline symbol to something else
2009-03-12 6:56 ` Andrew Morton
@ 2009-03-13 5:52 ` Sam Ravnborg
2009-03-13 5:51 ` Kyle McMartin
0 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2009-03-13 5:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: Kyle McMartin, linux-kernel, jakub, linux-kbuild
On Wed, Mar 11, 2009 at 11:56:51PM -0700, Andrew Morton wrote:
> On Wed, 11 Mar 2009 14:59:42 -0400 Kyle McMartin <kyle@infradead.org> wrote:
>
> > On Wed, Mar 11, 2009 at 07:37:35PM +0100, Sam Ravnborg wrote:
> > > > Rawhide builds are currently failing to build unifdef.c, as the next
> > > > version of glibc changes the default _POSIX_C_SOURCE level, which
> > > > exposes getline() from <stdio.h>
> > > >
> > > > scripts/unifdef.c:209: error: conflicting types for 'getline'
> > > > /usr/include/stdio.h:653: note: previous declaration of 'getline' was
> > > > here
> > > > make[2]: *** [scripts/unifdef] Error 1
> > > > make[1]: *** [__headers] Error 2
> > > > make: *** [vmlinux] Error 2
> > > >
> > > > Rename the symbol in unifdef.c to parseline to avoid this conflicting
> > > > declaration.
> > >
> > > I have a similar patch queued in kbuild-fixes.git.
> > >
> >
> > Great, thanks. Is this going to go into the next -rc?
> >
>
> I was going to put it into 2.6.29 but Sam stole it :)
Bad boy.
The patch is included in -rc8 so everyone is happy again.
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scripts/unifdef.c: rename getline symbol to something else
2009-03-13 5:52 ` Sam Ravnborg
@ 2009-03-13 5:51 ` Kyle McMartin
0 siblings, 0 replies; 6+ messages in thread
From: Kyle McMartin @ 2009-03-13 5:51 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Andrew Morton, Kyle McMartin, linux-kernel, jakub, linux-kbuild
On Fri, Mar 13, 2009 at 06:52:09AM +0100, Sam Ravnborg wrote:
> > I was going to put it into 2.6.29 but Sam stole it :)
> Bad boy.
> The patch is included in -rc8 so everyone is happy again.
>
Yup, I dropped the other patch from rawhide for -rc8.
Thanks again Sam,
Kyle
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-03-13 5:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-11 16:17 [PATCH] scripts/unifdef.c: rename getline symbol to something else Kyle McMartin
2009-03-11 18:37 ` Sam Ravnborg
2009-03-11 18:59 ` Kyle McMartin
2009-03-12 6:56 ` Andrew Morton
2009-03-13 5:52 ` Sam Ravnborg
2009-03-13 5:51 ` Kyle McMartin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).