diff options
author | Richard Linden <none@none> | 2013-08-26 18:41:36 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-26 18:41:36 -0700 |
commit | 82e96bb389b4a930e9ca42865702f293fbf31e70 (patch) | |
tree | 8b6259fe47cb77bfb3ebc72dcd52d97ab983971e | |
parent | 0b96a0e80c34067056811d100fd5d4e7404e07b5 (diff) | |
parent | e1c09b9b5943cfa2f35eef878643b90d412a41ab (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
-rwxr-xr-x | indra/llcommon/llpreprocessor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index eea63d443f..f00885ae2f 100755 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -189,7 +189,7 @@ #define LL_TYPEOF(exp) typeof(exp) #endif -#define LL_TO_STRING_HELPER(x) #x
+#define LL_TO_STRING_HELPER(x) #x #define LL_TO_STRING(x) LL_TO_STRING_HELPER(x) #define LL_FILE_LINENO(msg) __FILE__ "(" LL_TO_STRING(__LINE__) ") : " msg #if LL_WINDOWS |