[backfire] mkimage: backport Darwin 10.7 fix from r27917

SVN-Revision: 29984

diff --git a/tools/mkimage/patches/100-portability.patch b/tools/mkimage/patches/100-portability.patch
index ae38ad68eaec06f618dc24153dbc815d1de2efb9..9f2c0bbd1649ae79bde786b20d073c805142ac36 100644 (file)
--- a/tools/mkimage/patches/100-portability.patch
+++ b/tools/mkimage/patches/100-portability.patch
@@ -1,10 +1,11 @@
 --- a/tools/kwbimage.c
 +++ b/tools/kwbimage.c
-@@ -206,6 +206,28 @@ INVL_DATA:
+@@ -206,6 +206,30 @@ INVL_DATA:
        exit (EXIT_FAILURE);
  }
  
 +#ifndef __GLIBC__
++#if !defined(__APPLE__) || __DARWIN_C_LEVEL < 200809L
 +static ssize_t
 +getline(char **line, size_t *len, FILE *fd)
 +{
@@ -25,6 +26,7 @@
 +      return tmplen;
 +}
 +#endif
++#endif
 +
  /*
   * this function sets the kwbimage header by-