Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 973cd9a)
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 patch | blob | history

diff --git a/src/helper/command.c b/src/helper/command.c
index ab827859f754caf2a613f2bdbbcc68f64006bb53..0ddcd019c1fd3055849f648ae370dd12aa3c57b5 100644 (file)
--- 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",
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)