summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llversioninfo_test.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-02-28 18:28:13 -0800
committerGraham Linden <graham@lindenlab.com>2019-02-28 18:28:13 -0800
commitbf8dee73f90f74f3eb9fd544dc9673defa52817f (patch)
tree3e8a711051c699fe96afcfead0e3fd4dc4f19db3 /indra/newview/tests/llversioninfo_test.cpp
parentc1d2416826406631807f153e7de9d2b790b0caa5 (diff)
parente1a76999c3e8aad337d765fcd6eb50c8191409ea (diff)
Merge 6.1.1
Diffstat (limited to 'indra/newview/tests/llversioninfo_test.cpp')
-rw-r--r--indra/newview/tests/llversioninfo_test.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
index 2f7a4e9601..58f0469552 100644
--- a/indra/newview/tests/llversioninfo_test.cpp
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -33,10 +33,8 @@
// LL_VIEWER_CHANNEL is a macro defined on the compiler command line. The
// macro expands to the string name of the channel, but without quotes. We
-// need to turn it into a quoted string. This macro trick does that.
-#define stringize_inner(x) #x
-#define stringize_outer(x) stringize_inner(x)
-#define ll_viewer_channel stringize_outer(LL_VIEWER_CHANNEL)
+// need to turn it into a quoted string. LL_TO_STRING() does that.
+#define ll_viewer_channel LL_TO_STRING(LL_VIEWER_CHANNEL)
namespace tut
{