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 1ed89e6c85c4fde975c28a2bebedfcbbc8741a69..319c0fe2a23ed39324293fd3243feb21d1b0ccd3 100644 (file)
--- 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 7dcbee4b3e508ecf8c6d50c6143f4f2ecffe0e15..5bf7add39cc5d4fdfcfa20cd4528d596c855b75e 100644 (file)
--- 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