diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-02-25 14:03:30 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-02-25 14:03:30 +0000 |
| commit | e260ec6e9d85a81d950956227c343a1c38815b42 (patch) | |
| tree | 78e5edb1c30a4288afa63c218981072c42ae24b7 /src | |
| parent | 7ce3f3c1a636439a6f0dc5fffc58f7f69f9febd4 (diff) | |
[trunk] Import commit 87b08a096bb8ad61f9dbe4811e208d9c9d7fe63b from ghostpdl
don't define lrintf for MSVC 2013 (fix compilation breakage)
Update issue 225
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/opj_includes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h index 9d74e470..bdbb7c6c 100644 --- a/src/lib/openjp2/opj_includes.h +++ b/src/lib/openjp2/opj_includes.h @@ -129,8 +129,8 @@ Most compilers implement their own version of this keyword ... #endif #endif -/* MSVC and Borland C do not have lrintf */ -#if defined(_MSC_VER) || defined(__BORLANDC__) +/* MSVC before 2013 and Borland C do not have lrintf */ +#if defined(_MSC_VER) && (_MSC_VER < 1800) || defined(__BORLANDC__) static INLINE long lrintf(float f){ #ifdef _M_X64 return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); |