Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/uClibc/0.9.30.1/180-getline-conflict.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jan 22 22:32:25 2011 +0100 (2011-01-22)
changeset 2268 1300e1714c13
permissions -rw-r--r--
libc/uClibc: move content of do_libc_headers into do_libc_start_files

It is unnecessary to split C library preparation into two steps, as only
one really makes sense. So, do_libc_headers is bound to be withdrawn
short-term, in favor of do_libc_start_files.

uClibc already had all its start files installation in do_libc_headers, and
do_libc_start_files was empty, just migrate the content of the former into
the latter.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 --- a/extra/scripts/unifdef.c

     2 +++ b/extra/scripts/unifdef.c

     3 @@ -206,7 +206,7 @@

     4  static void             error(const char *);

     5  static int              findsym(const char *);

     6  static void             flushline(bool);

     7 -static Linetype         getline(void);

     8 +static Linetype         get_line(void);

     9  static Linetype         ifeval(const char **);

    10  static void             ignoreoff(void);

    11  static void             ignoreon(void);

    12 @@ -512,7 +512,7 @@

    13 

    14  	for (;;) {

    15  		linenum++;

    16 -		lineval = getline();

    17 +		lineval = get_line();

    18  		trans_table[ifstate[depth]][lineval]();

    19  		debug("process %s -> %s depth %d",

    20  		    linetype_name[lineval],

    21 @@ -526,7 +526,7 @@

    22   * help from skipcomment().

    23   */

    24  static Linetype

    25 -getline(void)

    26 +get_line(void)

    27  {

    28  	const char *cp;

    29  	int cursym;

    30
crosstool-ng