summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-04-17 16:35:21 +0000
committerDave Houlton <euclid@lindenlab.com>2020-04-17 16:35:21 +0000
commitfb49ca2ee6830b256b3f8acda6a6e7b5070bef27 (patch)
treec19c8966d5f5fc5cb5f1b7f891abaf4233f50fd4
parent794778eede8e9081374d1021c465ba5e472d2e58 (diff)
parent11e9fbefeb11f4ed90e22e7f0a0558442317875e (diff)
Merged in euclid-xcode (pull request #78)
Pull Brad's fixes for Xcode 11.4 into DRTVWR-440
-rw-r--r--indra/llcommon/llsdutil.cpp2
-rw-r--r--indra/newview/llcommandhandler.cpp2
-rw-r--r--indra/newview/llxmlrpclistener.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 6a23c443a0..1f8384f415 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -506,7 +506,7 @@ struct Data
const char* name;
} typedata[] =
{
-#define def(type) { LLSD::type, #type + 4 }
+#define def(type) { LLSD::type, &#type[4] }
def(TypeUndefined),
def(TypeBoolean),
def(TypeInteger),
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 */