public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] tools/os_support: add OS X Lion support
@ 2011-11-24 21:36 Andreas Bießmann
  2011-11-25  8:23 ` Marek Vasut
  2011-11-25 19:29 ` Andy Fleming
  0 siblings, 2 replies; 6+ messages in thread
From: Andreas Bießmann @ 2011-11-24 21:36 UTC (permalink / raw)
  To: u-boot

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
 
-- 
1.7.7.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-11-26 23:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2011-11-25 19:29 ` Andy Fleming
2011-11-26 10:52   ` Andreas Bießmann
2011-11-26 23:55   ` Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox