diff options
| author | Andreas Bießmann <andreas.devel@googlemail.com> | 2011-11-24 22:36:16 +0100 |
|---|---|---|
| committer | Marek Vasut <marek.vasut@gmail.com> | 2011-12-02 10:56:21 +0100 |
| commit | 6f26185435fa196ab6ca605575fc880d2d0b3e27 (patch) | |
| tree | c5f736412f339b51c0bf2c66dc0cffa212540a00 | |
| parent | bbb1fe462cfbd248656553c082135738d8646239 (diff) | |
| download | u-boot-imx-6f26185435fa196ab6ca605575fc880d2d0b3e27.zip u-boot-imx-6f26185435fa196ab6ca605575fc880d2d0b3e27.tar.gz u-boot-imx-6f26185435fa196ab6ca605575fc880d2d0b3e27.tar.bz2 | |
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>
| -rw-r--r-- | tools/os_support.c | 2 | ||||
| -rw-r--r-- | tools/os_support.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/os_support.c b/tools/os_support.c index 1ed89e6..319c0fe 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 7dcbee4..5bf7add 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 |