summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapr.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-04 14:11:45 -0700
committerRichard Linden <none@none>2011-10-04 14:11:45 -0700
commita8fcfc5e19811ce579799d415a9ad63a0f1f6dc7 (patch)
tree92e06967bb8e12b60bf97866ba8b8252ac35449a /indra/llcommon/llapr.h
parent00432563400bedb0c0e3f5991f170874bf633984 (diff)
removed attempt at templating LLUI::Clamp values in order to get build working again
Diffstat (limited to 'indra/llcommon/llapr.h')
-rw-r--r--indra/llcommon/llapr.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 286fc43a77..3f846f1314 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -37,9 +37,6 @@
// If you get undefined symbols, find the appropriate
// Windows header file and include that in your .cpp file.
#define WIN32_LEAN_AND_MEAN
- // do not define min() and max() macros, which collide with
- // things like numeric_limits<T>
- #define NOMINMAX
#include <winsock2.h>
#include <windows.h>
#endif