From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] tools/os_support: add OS X Lion support
Date: Fri, 25 Nov 2011 09:25:13 +0100 [thread overview]
Message-ID: <201111250925.13438.marek.vasut@gmail.com> (raw)
In-Reply-To: <201111250923.45949.marek.vasut@gmail.com>
> > 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>
> > ---
> > 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 <marek.vasut@gmail.com>
Picked to:
u-boot-staging.git / marek.vasut at gmail.com
next prev parent reply other threads:[~2011-11-25 8:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 21:36 [U-Boot] [PATCH] tools/os_support: add OS X Lion support Andreas Bießmann
2011-11-25 8:23 ` Marek Vasut
2011-11-25 8:25 ` Marek Vasut [this message]
2011-11-25 19:29 ` Andy Fleming
2011-11-26 10:52 ` Andreas Bießmann
2011-11-26 23:55 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201111250925.13438.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox