From aafd3877e6fbc1745dbfc5d4f54a2c7efe8cc3d6 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Sat, 9 Jan 2010 15:41:31 +0900 Subject: buildfix on MacOS Recent Apple gcc versions use __APPLE__ instead of __DARWIN__; accept that too. Also use #warning, not #warn; neither is standard, but most CPP versions require it to be spelled out. Signed-off-by: David Brownell --- src/helper/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/helper/command.c b/src/helper/command.c index ab827859..0ddcd019 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -1361,7 +1361,7 @@ struct command_context* command_init(const char *startup_tcl, Jim_Interp *interp HostOs = "winxx"; #elif defined(__linux__) HostOs = "linux"; -#elif defined(__DARWIN__) +#elif defined(__APPLE__) || defined(__DARWIN__) HostOs = "darwin"; #elif defined(__CYGWIN__) HostOs = "cygwin"; @@ -1370,7 +1370,7 @@ struct command_context* command_init(const char *startup_tcl, Jim_Interp *interp #elif defined(__ECOS) HostOs = "ecos"; #else -#warn unrecognized host OS... +#warning "Unrecognized host OS..." HostOs = "other"; #endif Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS", -- cgit v1.2.3