From: Andreas Bießmann <andreas.devel@googlemail.com>
Date: Thu, 24 Nov 2011 21:36:16 +0000 (+0100)
Subject: tools/os_support: add OS X Lion support
X-Git-Tag: v2011.12-rc1~94^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6f26185435fa196ab6ca605575fc880d2d0b3e27;p=u-boot

tools/os_support: add OS X Lion support

OS X Lion's c-library implements getline(), therefore prevent including the old
helper implementation for __DARWIN_C_LEVEL < 200809L.

Without this patch following error occours:

---8<---
In file included from os_support.h:32,
                 from img2srec.c:55:
getline.h:1: error: conflicting types for ‘getline’
/usr/include/stdio.h:449: error: previous declaration of ‘getline’ was
here
--->8---

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
---

diff --git a/tools/os_support.c b/tools/os_support.c
index 1ed89e6c85..319c0fe2a2 100644
--- a/tools/os_support.c
+++ b/tools/os_support.c
@@ -23,6 +23,6 @@
 #ifdef __MINGW32__
 #include "mingw_support.c"
 #endif
-#ifdef __APPLE__
+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L
 #include "getline.c"
 #endif
diff --git a/tools/os_support.h b/tools/os_support.h
index 7dcbee4b3e..5bf7add39c 100644
--- a/tools/os_support.h
+++ b/tools/os_support.h
@@ -28,7 +28,7 @@
 #include "mingw_support.h"
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L
 #include "getline.h"
 #endif