diff options
| author | Chris Flerackers <cflerackers@androme.be> | 2004-01-09 18:00:31 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-01-09 18:00:31 +0000 |
| commit | 7f965c1c896e7ea6ec249e042147f3eb905bda7b (patch) | |
| tree | 24a844089e3d1522587920d80b9718c0aabfcbfa /libavcodec/common.h | |
| parent | 84f986c0f42a2553122713575c7256c9babe2854 (diff) | |
| download | ffmpeg-7f965c1c896e7ea6ec249e042147f3eb905bda7b.tar.gz | |
inttypes emulation cleanup patch by ("Chris Flerackers" <cflerackers at androme dot be>)
Originally committed as revision 2681 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/common.h')
| -rw-r--r-- | libavcodec/common.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index 385372f792..ee5a4cbd82 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -82,6 +82,25 @@ extern const struct AVOption avoptions_workaround_bug[11]; # define always_inline inline #endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#else + typedef signed char int8_t; + typedef signed short int16_t; + typedef signed int int32_t; + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + typedef unsigned int uint32_t; + +# ifdef CONFIG_WIN32 + typedef signed __int64 int64_t; + typedef unsigned __int64 uint64_t; +# else /* other OS */ + typedef signed long long int64_t; + typedef unsigned long long uint64_t; +# endif /* other OS */ +#endif /* HAVE_INTTYPES_H */ + #ifdef EMULATE_FAST_INT /* note that we don't emulate 64bit ints */ typedef signed char int_fast8_t; @@ -102,15 +121,6 @@ static inline float floorf(float f) { /* windows */ -typedef unsigned short uint16_t; -typedef signed short int16_t; -typedef unsigned char uint8_t; -typedef unsigned int uint32_t; -typedef unsigned __int64 uint64_t; -typedef signed char int8_t; -typedef signed int int32_t; -typedef signed __int64 int64_t; - # ifndef __MINGW32__ # define int64_t_C(c) (c ## i64) # define uint64_t_C(c) (c ## i64) @@ -137,8 +147,6 @@ typedef signed __int64 int64_t; #elif defined (CONFIG_OS2) /* OS/2 EMX */ -#include <inttypes.h> - #ifndef int64_t_C #define int64_t_C(c) (c ## LL) #define uint64_t_C(c) (c ## ULL) @@ -159,8 +167,6 @@ typedef signed __int64 int64_t; /* unix */ -#include <inttypes.h> - #ifndef int64_t_C #define int64_t_C(c) (c ## LL) #define uint64_t_C(c) (c ## ULL) |