diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-05 21:32:42 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-05 21:32:42 +0100 |
| commit | 163b29469d27452a3461e0b5947030a2abfe6169 (patch) | |
| tree | 6fac0698730e1d5df87c22ce86c75fa708e736e0 /tools | |
| parent | 6d1d5cf96ef9d7756a741709071c9c23b8490a0c (diff) | |
| parent | 6f26185435fa196ab6ca605575fc880d2d0b3e27 (diff) | |
| download | u-boot-imx-163b29469d27452a3461e0b5947030a2abfe6169.zip u-boot-imx-163b29469d27452a3461e0b5947030a2abfe6169.tar.gz u-boot-imx-163b29469d27452a3461e0b5947030a2abfe6169.tar.bz2 | |
Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging
* 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging:
tools/os_support: add OS X Lion support
board/esd/dasa_sim/flash.c: Fix GCC 4.6 warning
board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning
Diffstat (limited to 'tools')
| -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 |