From: Edgar Grimberg <edgar.grimberg@gmail.com>
Date: Wed, 17 Oct 2012 22:27:02 +0000 (+0200)
Subject: ioutil: make the file compile on MacOS
X-Git-Url: https://git.gag.com/?p=fw%2Fopenocd;a=commitdiff_plain;h=6f65045b3791525e99d09d07b5f9d8dd5aa511e5

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

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 684950d14..dc0c5c460 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,