]> git.sur5r.net Git - openocd/commitdiff
buildfix on MacOS
authorMasaki Muranaka <monaka@monami-software.com>
Sat, 9 Jan 2010 06:41:31 +0000 (15:41 +0900)
committerDavid Brownell <dbrownell@users.sourceforge.net>
Sat, 9 Jan 2010 08:10:18 +0000 (00:10 -0800)
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 <dbrownell@users.sourceforge.net>
src/helper/command.c

index ab827859f754caf2a613f2bdbbcc68f64006bb53..0ddcd019c1fd3055849f648ae370dd12aa3c57b5 100644 (file)
@@ -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",