diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
| commit | bbfee34e9e2a3d8e8572dd41b3601e783d35a675 (patch) | |
| tree | fbb36728165d9c4ea8b60e0cac340652dbc7e30d /intern/dualcon | |
| parent | ae7b67902191abb7e5aefbdcc20b84f050ec2b08 (diff) | |
| parent | 2e98524b58a53f0d546e5f1e7d549d2f45815055 (diff) | |
Merge remote-tracking branch 'origin/master' into uv_unwrapping_slim_algorithm
Diffstat (limited to 'intern/dualcon')
| -rw-r--r-- | intern/dualcon/intern/Projections.h | 2 | ||||
| -rw-r--r-- | intern/dualcon/intern/dualcon_c_api.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/dualcon/intern/Projections.h b/intern/dualcon/intern/Projections.h index 2d1eca55997..2d245a77d15 100644 --- a/intern/dualcon/intern/Projections.h +++ b/intern/dualcon/intern/Projections.h @@ -29,7 +29,7 @@ #define CONTAINS_INDEX #define GRID_DIMENSION 20 -#if defined(_WIN32) && !defined(__MINGW32__) && !(_MSC_VER >= 1900) +#if defined(_WIN32) && !(_MSC_VER >= 1900) #define isnan(n) _isnan(n) #define LONG __int64 #define int64_t __int64 diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp index e55de2ed354..92f8b0cfd1a 100644 --- a/intern/dualcon/intern/dualcon_c_api.cpp +++ b/intern/dualcon/intern/dualcon_c_api.cpp @@ -28,7 +28,7 @@ #include <cstdio> #include <float.h> -#if defined(_WIN32) && !defined(__MINGW32__) +#if defined(_WIN32) #define isnan(n) _isnan(n) #endif |