patches/uClibc/0.9.30.1/180-getline-conflict.patch
author David Holsgrove <david.holsgrove@xilinx.com>
Thu Oct 04 13:26:14 2012 +1000 (2012-10-04)
changeset 3075 aadd4647dd91
permissions -rw-r--r--
scripts/functions: add a generic custom location infrastructure

Add a generic custom location infrastructure (inspired by the one in
kernel/linux) to allow the user to use custom tarballs or directories
for any component.

Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>
[yann.morin.1998@free.fr: move config option, improve help text, fix API doc]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <131c163c69f9cc81d2be.1349931191@localhost.localdomain>
PatchWork-Id: 190784
Message-Id: <0bbaba9190a76ba97f72.1349931192@localhost.localdomain>
PatchWork-Id: 190785
zdevai@1602
     1
--- a/extra/scripts/unifdef.c
zdevai@1602
     2
+++ b/extra/scripts/unifdef.c
zdevai@1602
     3
@@ -206,7 +206,7 @@
zdevai@1602
     4
 static void             error(const char *);
zdevai@1602
     5
 static int              findsym(const char *);
zdevai@1602
     6
 static void             flushline(bool);
zdevai@1602
     7
-static Linetype         getline(void);
zdevai@1602
     8
+static Linetype         get_line(void);
zdevai@1602
     9
 static Linetype         ifeval(const char **);
zdevai@1602
    10
 static void             ignoreoff(void);
zdevai@1602
    11
 static void             ignoreon(void);
zdevai@1602
    12
@@ -512,7 +512,7 @@
zdevai@1602
    13
zdevai@1602
    14
 	for (;;) {
zdevai@1602
    15
 		linenum++;
zdevai@1602
    16
-		lineval = getline();
zdevai@1602
    17
+		lineval = get_line();
zdevai@1602
    18
 		trans_table[ifstate[depth]][lineval]();
zdevai@1602
    19
 		debug("process %s -> %s depth %d",
zdevai@1602
    20
 		    linetype_name[lineval],
zdevai@1602
    21
@@ -526,7 +526,7 @@
zdevai@1602
    22
  * help from skipcomment().
zdevai@1602
    23
  */
zdevai@1602
    24
 static Linetype
zdevai@1602
    25
-getline(void)
zdevai@1602
    26
+get_line(void)
zdevai@1602
    27
 {
zdevai@1602
    28
 	const char *cp;
zdevai@1602
    29
 	int cursym;
zdevai@1602
    30