diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 18:55:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 18:55:19 -0300 |
| commit | 9827c3cd26e4df8d382b1d41322eed6548a6453f (patch) | |
| tree | 77fdfaa40dee6ca8fa92f365b93d50eb1475a2b4 | |
| parent | 5dcfdb343572086a1f495497ba896436326792d9 (diff) | |
| parent | 03d4c05150deb7e78444a8c7f893855c07c0f775 (diff) | |
Merge pull request #2748 from vnen/fix-2744
Fix Opus driver build for VS2010 and VS2012
| -rw-r--r-- | drivers/opus/opus_config.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/opus/opus_config.h b/drivers/opus/opus_config.h index c6470e92c3..98c3e87cc6 100644 --- a/drivers/opus/opus_config.h +++ b/drivers/opus/opus_config.h @@ -7,12 +7,16 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 +#if (!defined( _MSC_VER ) || ( _MSC_VER >= 1800 )) + /* Define to 1 if you have the `lrint' function. */ #define HAVE_LRINT 1 /* Define to 1 if you have the `lrintf' function. */ #define HAVE_LRINTF 1 +#endif + /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -109,7 +113,11 @@ /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is supported directly. */ +#if (!defined( _MSC_VER ) || ( _MSC_VER >= 1800 )) #define restrict __restrict +#else +#undef restrict +#endif /* Work around a bug in Sun C++: it does not support _Restrict or __restrict__, even though the corresponding Sun C compiler ends up with "#define restrict _Restrict" or "#define restrict __restrict__" in the |