diff options
author | Oz Linden <oz@lindenlab.com> | 2020-06-15 17:11:22 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2020-06-15 17:11:22 -0400 |
commit | 936e13226b52c960b7a77ccfd10357fb14353aa3 (patch) | |
tree | 612069d59401e273ca44788ae0d4e8411ef67576 /indra/newview | |
parent | 86009f885efc796850d3e5b612c896a9d737fb86 (diff) | |
parent | 68105d9f06aea69980cf0402f00da0e2be450dd2 (diff) |
SL-10297: xcode compatibility fix
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llcommandhandler.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index 76d965b1f1..23e2271eae 100644 --- a/indra/newview/llcommandhandler.cpp +++ b/indra/newview/llcommandhandler.cpp @@ -222,7 +222,7 @@ struct symbol_info #define ent(SYMBOL) \ { \ - #SYMBOL + 28, /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ + &#SYMBOL[28], /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ SYMBOL \ } diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index 0693d08dfb..0daf3e761d 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -100,7 +100,7 @@ public: { // from curl.h // skip the "CURLE_" prefix for each of these strings -#define def(sym) (mMap[sym] = #sym + 6) +#define def(sym) (mMap[sym] = &#sym[6]) def(CURLE_OK); def(CURLE_UNSUPPORTED_PROTOCOL); /* 1 */ def(CURLE_FAILED_INIT); /* 2 */ |