diff options
| author | Richard Linden <none@none> | 2011-10-04 13:27:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-04 13:27:18 -0700 |
| commit | 00432563400bedb0c0e3f5991f170874bf633984 (patch) | |
| tree | 722ac74193c7bd5329eba16485d73b9b1d111dcf /indra/llcommon/llapr.h | |
| parent | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (diff) | |
| parent | 50c0447808f7041d5af5017c847a462e9599bdb5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llcommon/llapr.h')
| -rw-r--r-- | indra/llcommon/llapr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 3f846f1314..286fc43a77 100644 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -37,6 +37,9 @@ // 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 |