host/include/getline.h - Mac OS X 10.7 (Lion) fix

Apple has finally updated their version of Libc, and it now includes getline(). \o/

The following patch fixes OpenWRT getline.h to not redefine it for 10.7. The one
caveat is, the includes (at least stdio.h) are needed before the #ifdef so that
__DARWIN_C_LEVEL could be properly defined (it is not a compiler built-in define
like __linux__ or __APPLE__).

This one fixes the host/include/getline.h. The next patch will mend the mkimage
package.

Signed-off-by: Joe Roback <openwrt-devel at roback.cc>
SVN-Revision: 27916

diff --git a/tools/include/getline.h b/tools/include/getline.h
index b9a3f7150fd792e9007a8303d35ab009f12df05e..02df6c2f7900734aa9798c3eeef0cc6e9607ae88 100644 (file)
--- a/tools/include/getline.h
+++ b/tools/include/getline.h
@@ -27,12 +27,12 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __linux__
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#if !defined(__linux__) && !(defined(__APPLE__) && __DARWIN_C_LEVEL >= 200809L)
 /*
  * Emulate glibc getline() via BSD fgetln().
  * Note that outsize is not changed unless memory is allocated.