diff options
| author | Kinan Hakim <kinan@google.com> | 2016-01-27 14:05:54 +0100 |
|---|---|---|
| committer | Kinan Hakim <kinan@google.com> | 2016-01-27 13:11:35 +0000 |
| commit | 0baf877c64aeb9f5c5d0d3f13c8d2eb25a3c8837 (patch) | |
| tree | 7f561f03d6f1866cafa8c206ce110e926597d29c | |
| parent | 3c5bda32ce3dd64d94739177efd9d84764b545f4 (diff) | |
| download | dng_sdk-0baf877c64aeb9f5c5d0d3f13c8d2eb25a3c8837.tar.gz | |
Fix the compiler issue for DNG SDK in VS2010 or newer versions.
| -rw-r--r-- | source/dng_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/dng_types.h b/source/dng_types.h index ee4dab9..f59771d 100644 --- a/source/dng_types.h +++ b/source/dng_types.h @@ -97,8 +97,10 @@ typedef double real64; /*****************************************************************************/ // Visual Studio now prefers _hypot to hypot +// Note: since Visual Studio 2010, there is a definition of hypot (in math.h), +// we only define hypot here for the older Visual Studio versions. -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1600 #ifdef hypot #undef hypot |