diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 16:35:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 16:35:26 -0700 |
| commit | 9ead64974b05501bbac0d63a47c99fa786d064ba (patch) | |
| tree | b385f49a07e92f5080c8e7219d888935ed46cc80 /scripts/unifdef.c | |
| parent | 0b80e3adc289de13cc70b33d90812ef136b6ea01 (diff) | |
| parent | 75bccd881a49d2da796ec0852158f957dc023f61 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: remove unused -r option for module-init-tool depmod
kbuild: fix 'make rpm' when CONFIG_LOCALVERSION_AUTO=y and using SCM tree
kbuild: fix mkspec to cleanup RPM_BUILD_ROOT
kbuild: fix C libary confusion in unifdef.c due to getline()
Diffstat (limited to 'scripts/unifdef.c')
| -rw-r--r-- | scripts/unifdef.c | 6 |
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; |