diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-28 08:41:14 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-28 08:41:23 +0100 |
| commit | 4ae42d43a47ff4b004ac51cae043c4c9f0ee390e (patch) | |
| tree | e62a79cdfe5fd7d6885bb2780041cebf88e94682 | |
| parent | 5f083afde18aac9ae0daeef4f04e33fa530f2126 (diff) | |
| parent | 00788416176a6f143e7a6484402d0ef8dd73f292 (diff) | |
Merge pull request #3321
0078841 prevent Windows redefinition warning cause by compat.h (Philip Kaufmann)
| -rw-r--r-- | src/compat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compat.h b/src/compat.h index 1deef493c2..f5e549d79c 100644 --- a/src/compat.h +++ b/src/compat.h @@ -11,7 +11,9 @@ #undef _WIN32_WINNT #endif #define _WIN32_WINNT 0x0501 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 +#endif #ifndef NOMINMAX #define NOMINMAX #endif |