Compile error work around.

2013-07-07 23:02:14 +02:00
parent ad6c539609
commit ebfbdac5ab
1 changed files with 4 additions and 0 deletions
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -31,6 +31,10 @@
 #include "v3math.h"
 #include "llvector4a.h"
 #include <vector>
+#ifdef TIME_UTC
+//Singu note: TIME_UTC is defined as '1' in time.h, and boost thread (1.49) tries to use it as an enum member.
+#undef TIME_UTC
+#endif
 #include <boost/pool/pool.hpp>

 #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG