new upstream release 2.51 with some fixes, see

[openwrt.git] / toolchain / uClibc / patches-0.9.30.1 / 160-unifdef_fix.patch

diff --git a/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch b/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch
index 2b29060..6c7b221 100644 (file)
--- a/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch
+++ b/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch
@@ -1,29 +1,43 @@
---- a/extra/scripts/unifdef.c
-+++ b/extra/scripts/unifdef.c
-@@ -206,7 +206,7 @@ static void             done(void);
+Index: uClibc-0.9.30.1/extra/scripts/unifdef.c
+===================================================================
+--- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c       2008-04-28 01:10:00.000000000 +0200
++++ uClibc-0.9.30.1/extra/scripts/unifdef.c    2009-08-25 15:20:08.000000000 +0200
+@@ -206,7 +206,11 @@

  static void             error(const char *);
  static int              findsym(const char *);
  static void             flushline(bool);
 -static Linetype         getline(void);
  static void             error(const char *);
  static int              findsym(const char *);
  static void             flushline(bool);
 -static Linetype         getline(void);

++#ifndef __CYGWIN__

 +static Linetype         __getline(void);
 +static Linetype         __getline(void);

++#else
++static Linetype               get_line(void);
++#endif

  static Linetype         ifeval(const char **);
  static void             ignoreoff(void);
  static void             ignoreon(void);
  static Linetype         ifeval(const char **);
  static void             ignoreoff(void);
  static void             ignoreon(void);

-@@ -512,7 +512,7 @@ process(void)
+@@ -512,7 +516,11 @@

  
        for (;;) {
                linenum++;
 -              lineval = getline();
  
        for (;;) {
                linenum++;
 -              lineval = getline();

++#ifndef __CYGWIN__

 +              lineval = __getline();
 +              lineval = __getline();

++#else
++              lineval = get_line();
++#endif

                trans_table[ifstate[depth]][lineval]();
                debug("process %s -> %s depth %d",
                    linetype_name[lineval],
                trans_table[ifstate[depth]][lineval]();
                debug("process %s -> %s depth %d",
                    linetype_name[lineval],

-@@ -526,7 +526,7 @@ process(void)
+@@ -526,7 +534,11 @@

   * help from skipcomment().
   */
  static Linetype
 -getline(void)
   * help from skipcomment().
   */
  static Linetype
 -getline(void)

++#ifndef __CYGWIN__

 +__getline(void)
 +__getline(void)

++#else
++get_line(void)
++#endif

  {
        const char *cp;
        int cursym;
  {
        const char *cp;
        int cursym;