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/llwindow | |
| parent | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (diff) | |
| parent | 50c0447808f7041d5af5017c847a462e9599bdb5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/lldragdropwin32.h | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/lldragdropwin32.h b/indra/llwindow/lldragdropwin32.h index 929e7f9e37..63054bffec 100644 --- a/indra/llwindow/lldragdropwin32.h +++ b/indra/llwindow/lldragdropwin32.h @@ -31,6 +31,7 @@ #ifndef LL_LLDRAGDROP32_H #define LL_LLDRAGDROP32_H +#define NOMINMAX #include <windows.h> #include <ole2.h> @@ -54,6 +55,7 @@ class LLDragDropWin32 #ifndef LL_LLDRAGDROP32_H #define LL_LLDRAGDROP32_H +#define NOMINMAX #include <windows.h> #include <ole2.h> diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 387e4cbdb6..dc1950fb31 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -29,6 +29,7 @@ // Limit Windows API to small and manageable set. #define WIN32_LEAN_AND_MEAN +#define NOMINMAX #include <winsock2.h> #include <windows.h> |