diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-11-04 19:35:43 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2003-11-04 19:35:43 +0000 |
| commit | 19d053c5ba6c250ef8a9675bf803cb744085d2f1 (patch) | |
| tree | 0ef52a1910e857e48c4d534f496a2c93e64cdab6 /libavcodec | |
| parent | ec62c38fd57d8276e235ca7d95d785850dc93bf8 (diff) | |
* fixes for broken builds on Solaris, OS2 and all bingendian
systems out there.
Originally committed as revision 2480 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/common.h | 16 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index a46a010aaa..f41edee4e6 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -82,6 +82,22 @@ extern const struct AVOption avoptions_workaround_bug[11]; # define always_inline inline #endif +#ifdef EMULATE_FAST_INT +/* note that we don't emulate 64bit ints */ +typedef signed char int_fast8_t; +typedef signed int int_fast16_t; +typedef signed int int_fast32_t; +typedef unsigned char uint_fast8_t; +typedef unsigned int uint_fast16_t; +typedef unsigned int uint_fast32_t; +#endif + +#if defined(CONFIG_OS2) || defined(CONFIG_SUNOS) +static inline float floorf(float f) { + return floor(f); +} +#endif + #ifdef CONFIG_WIN32 /* windows */ diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 744182d628..0611f7cb78 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -502,10 +502,4 @@ static inline long int lrintf(float x) } #endif -#if defined(CONFIG_OS2) || defined(CONFIG_SUNOS) -static inline float floorf(float f) { - return floor(f); -} -#endif - #endif |