diff options
| author | Edgar Grimberg <edgar.grimberg@gmail.com> | 2012-10-18 00:27:02 +0200 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2012-10-28 01:38:58 +0000 |
| commit | 6f65045b3791525e99d09d07b5f9d8dd5aa511e5 (patch) | |
| tree | 97066487984b7b2cb97e78bc445f27070645ceea /src/helper | |
| parent | 077d77140ca7aaff3f301c33f20f3831d0913c11 (diff) | |
| download | riscv-openocd-6f65045b3791525e99d09d07b5f9d8dd5aa511e5.zip riscv-openocd-6f65045b3791525e99d09d07b5f9d8dd5aa511e5.tar.gz riscv-openocd-6f65045b3791525e99d09d07b5f9d8dd5aa511e5.tar.bz2 | |
ioutil: make the file compile on MacOS
The meminfo command cannot exist if the malloc.h header is not
present.
Cannot get the mac address without sys/ioctl.h and SIOCGIFHWADDR
defined
Change-Id: Ifc0fb98c3a60c53ad2e19473e08b34c460529d0b
Signed-off-by: Edgar Grimberg <edgar.grimberg@gmail.com>
Reviewed-on: http://openocd.zylin.com/912
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Reviewed-by: Peter Stuge <peter@stuge.se>
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/ioutil.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index 684950d..dc0c5c4 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -137,6 +137,7 @@ COMMAND_HANDLER(handle_trunc_command) return ERROR_OK; } +#ifdef HAVE_MALLOC_H COMMAND_HANDLER(handle_meminfo_command) { static int prev; @@ -155,7 +156,7 @@ COMMAND_HANDLER(handle_meminfo_command) return ERROR_OK; } - +#endif COMMAND_HANDLER(handle_append_command) { @@ -487,6 +488,8 @@ static int ioutil_Jim_Command_ip(Jim_Interp *interp, int argc, return JIM_OK; } +#ifdef HAVE_SYS_IOCTL_H +#ifdef SIOCGIFHWADDR /* not so pretty code to fish out eth0 mac address */ static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc, Jim_Obj *const *argv) @@ -545,6 +548,8 @@ static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc, return JIM_ERR; } +#endif +#endif static const struct command_registration ioutil_command_handlers[] = { { @@ -575,12 +580,14 @@ static const struct command_registration ioutil_command_handlers[] = { .help = "append a variable number of strings to a file", .usage = "file_name [<string1>, [<string2>, ...]]", }, +#ifdef HAVE_MALLOC_H { .name = "meminfo", .handler = handle_meminfo_command, .mode = COMMAND_ANY, .help = "display free heap space", }, +#endif { .name = "rm", .mode = COMMAND_ANY, @@ -616,12 +623,16 @@ static const struct command_registration ioutil_command_handlers[] = { .help = "show a listing of files", .usage = "dirname", }, +#ifdef HAVE_SYS_IOCTL_H +#ifdef SIOCGIFHWADDR { .name = "mac", .mode = COMMAND_ANY, .jim_handler = ioutil_Jim_Command_mac, .help = "show MAC address", }, +#endif +#endif { .name = "ip", .jim_handler = ioutil_Jim_Command_ip, |