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>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate. 
     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