summaryrefslogtreecommitdiff
path: root/indra/llcommon/llpreprocessor.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-27 13:41:19 -0700
committerRichard Linden <none@none>2013-08-27 13:41:19 -0700
commita7aed07a5b620977fb74e4070e432eef01d11d3c (patch)
treefad55eec609b298b066384e91ccf6425af8a53af /indra/llcommon/llpreprocessor.h
parent7ab616c18786afcb40ab0092fe6f8c6a3a799375 (diff)
broke out llunit.h into llunittype.h and llunits.h for unit declarations
changed unit declarations macros to make a lot more sense
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
-rwxr-xr-xindra/llcommon/llpreprocessor.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index f00885ae2f..0fcc872690 100755
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -193,12 +193,10 @@
#define LL_TO_STRING(x) LL_TO_STRING_HELPER(x)
#define LL_FILE_LINENO(msg) __FILE__ "(" LL_TO_STRING(__LINE__) ") : " msg
#if LL_WINDOWS
-#define LL_COMPILE_TIME_WARNING(msg) __pragma(message(LL_FILE_LINENO(msg)))
-#define LL_COMPILE_TIME_ERROR(msg) static_assert(false, msg)
+#define LL_COMPILE_TIME_MESSAGE(msg) __pragma(message(LL_FILE_LINENO(msg)))
#else
// no way to get gcc 4.2 to print a user-defined diagnostic message only when a macro is used
-#define LL_COMPILE_TIME_WARNING(msg)
-#define LL_COMPILE_TIME_ERROR(msg)
+#define LL_COMPILE_TIME_MESSAGE(msg)
#endif
#endif // not LL_LINDEN_PREPROCESSOR_H