Mercurial > libavcodec.hg
changeset 1735:cb0abe523bc6 libavcodec
inttypes emulation cleanup patch by ("Chris Flerackers" <cflerackers at androme dot be>)
| author | michael |
|---|---|
| date | Fri, 09 Jan 2004 18:00:31 +0000 |
| parents | 8aace334bcf0 |
| children | ff0b3acd5b22 |
| files | common.h |
| diffstat | 1 files changed, 19 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Thu Jan 08 23:51:23 2004 +0000 +++ b/common.h Fri Jan 09 18:00:31 2004 +0000 @@ -82,6 +82,25 @@ # 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 @@ /* 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 @@ #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 @@ /* unix */ -#include <inttypes.h> - #ifndef int64_t_C #define int64_t_C(c) (c ## LL) #define uint64_t_C(c) (c ## ULL)