diff options
| author | Richard Linden <none@none> | 2011-10-04 13:26:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-04 13:26:54 -0700 |
| commit | 50c0447808f7041d5af5017c847a462e9599bdb5 (patch) | |
| tree | bde88047b2f6bd4df35cc95bd49757dbdccf11dc /indra/llcommon | |
| parent | 44e9fb446f3c92c3dfd9b5be8a3e02ec5a44ba00 (diff) | |
disabled min and max windows macros
another attempt at fixing gcc builds
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llapr.h | 3 | ||||
| -rw-r--r-- | indra/llcommon/llprocesslauncher.h | 1 |
2 files changed, 4 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 diff --git a/indra/llcommon/llprocesslauncher.h b/indra/llcommon/llprocesslauncher.h index 954c249147..23e48b1823 100644 --- a/indra/llcommon/llprocesslauncher.h +++ b/indra/llcommon/llprocesslauncher.h @@ -28,6 +28,7 @@ #define LL_LLPROCESSLAUNCHER_H #if LL_WINDOWS +#define NOMINMAX #include <windows.h> #endif |