patches/uClibc/0.9.30.1/180-getline-conflict.patch
author Titus von Boxberg <titus@v9g.de>
Mon Aug 22 09:26:02 2011 +0200 (2011-08-22)
branch1.12
changeset 2640 e40c55e445b8
permissions -rw-r--r--
debug/ltrace: Fix HOST_OS and ar

HOST_OS really is the target OS. Allow setting it for configure
via an environment variable.
libltrace.a should have an index:
Allow ar to be set as an environment variable, and generate
an index in this lib.

Reported-by: "Guylhem Aznar" <crossgcc@guylhem.net>
Signed-off-by: "Titus von Boxberg" <titus@v9g.de>
(transplanted from f86af11138ea2b2ecd4876d9c6c24f58ba4d68ac)
     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