summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapr.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-09-30 10:41:29 -0700
committerRichard Linden <none@none>2012-09-30 10:41:29 -0700
commitb1baf982b1bd41a150233d0a28d3601226924c65 (patch)
tree6ec661467cac92ffae9070e2c3df9c51c614f060 /indra/llcommon/llapr.h
parent38354e19063478c8cda0408547ad05023b457041 (diff)
SH-3275 WIP Run viewer metrics for object update messages
factored out lltrace::sampler into separate file added rudimentary lltrace support to llstatgraph made llstatgraph use param blocks more effectively moves initial set of stats over to lltrace removed windows.h #defines for min and max
Diffstat (limited to 'indra/llcommon/llapr.h')
-rw-r--r--indra/llcommon/llapr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 830e0a33fa..4e704998c2 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -39,6 +39,8 @@
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
+ #undef min
+ #undef max
#endif
#include <boost/noncopyable.hpp>