diff options
| author | Ovnuniarchos | 2015-11-19 01:19:19 +0100 |
|---|---|---|
| committer | Ovnuniarchos | 2015-11-19 01:19:19 +0100 |
| commit | a9a330645b29152ccc29b6e075c0ebda24b03e37 (patch) | |
| tree | 2cf319ce8453dd295c40b809b4bf54527e4fe020 /drivers/opus/opus_config.h | |
| parent | 0f0dc1a5d328502343c5a902aec552fb01033504 (diff) | |
| parent | 94fdd01241749cb7a575ed5f9fa4c7bbb286901a (diff) | |
| download | godot-a9a330645b29152ccc29b6e075c0ebda24b03e37.tar.gz godot-a9a330645b29152ccc29b6e075c0ebda24b03e37.tar.zst godot-a9a330645b29152ccc29b6e075c0ebda24b03e37.zip | |
Merge branch 'master' into BBCodeDocs
Diffstat (limited to 'drivers/opus/opus_config.h')
| -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 c6470e92c..98c3e87cc 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 |