patches/uClibc/0.9.30.1/180-getline-conflict.patch
author Bernhard Walle <bernhard@bwalle.de>
Sun May 11 13:00:36 2014 +0200 (2014-05-11)
changeset 3318 579bc9107f99
permissions -rw-r--r--
complibs/ppl: Fix build of ppl 0.11.2 with gcc 4.9

From: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Tue, 29 Apr 2014 19:51:43 +0000 (+0200)
Subject: Added missing inclusions. Use std::ptrdiff_t.
X-Git-Url: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl%2Fppl.git;a=commitdiff;h=61d4e14dfd9f1121e9b4521dead5728b2424dd7c

Added missing inclusions. Use std::ptrdiff_t.
(Thanks to Paulo Cesar Pereira de Andrade.)

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Message-Id: <5632a171e7c1dc4c0fb5.1399806148@euler.fritz.box>
Patchwork-Id: 347777
     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