diff options
Diffstat (limited to 'extern/mantaflow/helper/util/vectorbase.h')
| -rw-r--r-- | extern/mantaflow/helper/util/vectorbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/mantaflow/helper/util/vectorbase.h b/extern/mantaflow/helper/util/vectorbase.h index a3135431eb3..41584663a0f 100644 --- a/extern/mantaflow/helper/util/vectorbase.h +++ b/extern/mantaflow/helper/util/vectorbase.h @@ -15,7 +15,7 @@ #define _VECTORBASE_H // get rid of windos min/max defines -#if defined(WIN32) || defined(_WIN32) +#if (defined(WIN32) || defined(_WIN32)) && !defined(NOMINMAX) # define NOMINMAX #endif |