From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Fri, 25 Nov 2011 09:23:45 +0100 Subject: [U-Boot] [PATCH] tools/os_support: add OS X Lion support In-Reply-To: <1322170576-50858-1-git-send-email-andreas.devel@googlemail.com> References: <1322170576-50858-1-git-send-email-andreas.devel@googlemail.com> Message-ID: <201111250923.45949.marek.vasut@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de > 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 > --- > total: 0 errors, 0 warnings, 15 lines checked > > NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX > MULTISTATEMENT_MACRO_USE_DO_WHILE > > 0001-tools-os_support-add-OS-X-Lion-support.patch has no obvious style > problems and is ready for submission. > > tools/os_support.c | 2 +- > 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 Acked-by: Marek Vasut