diff options
| author | Kirill Volinsky <KVolinsky@COMMON.EU.CORP.TOYOTA.com> | 2017-06-16 09:01:02 +0300 |
|---|---|---|
| committer | Kirill Volinsky <KVolinsky@COMMON.EU.CORP.TOYOTA.com> | 2017-06-16 09:01:02 +0300 |
| commit | 5c191ef54dfc00c1a25ad4e0fbc4ae290ebf2589 (patch) | |
| tree | 9ac9444a66d4d9057fbd22b76d95ee078500e32b /protocols/Tox/include/vpx/vpx_integer.h | |
| parent | 4f6145c3b880aba158633af290ce1210dcec95a1 (diff) | |
Tox: library update
Diffstat (limited to 'protocols/Tox/include/vpx/vpx_integer.h')
| -rw-r--r-- | protocols/Tox/include/vpx/vpx_integer.h | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/protocols/Tox/include/vpx/vpx_integer.h b/protocols/Tox/include/vpx/vpx_integer.h index 0ccc96cd12..09bad9222d 100644 --- a/protocols/Tox/include/vpx/vpx_integer.h +++ b/protocols/Tox/include/vpx/vpx_integer.h @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ - -#ifndef VPX_INTEGER_H -#define VPX_INTEGER_H +#ifndef VPX_VPX_INTEGER_H_ +#define VPX_VPX_INTEGER_H_ /* get ptrdiff_t, size_t, wchar_t, NULL */ #include <stddef.h> -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) -typedef signed char int8_t; +#if defined(_MSC_VER) +#define VPX_FORCE_INLINE __forceinline +#define VPX_INLINE __inline +#else +#define VPX_FORCE_INLINE __inline__ __attribute__(always_inline) +// TODO(jbb): Allow a way to force inline off for older compilers. +#define VPX_INLINE inline +#endif + +#if defined(VPX_EMULATE_INTTYPES) +typedef signed char int8_t; typedef signed short int16_t; -typedef signed int int32_t; +typedef signed int int32_t; -typedef unsigned char uint8_t; +typedef unsigned char uint8_t; typedef unsigned short uint16_t; -typedef unsigned int uint32_t; - -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; -#define INT64_MAX _I64_MAX -#define INT16_MAX _I16_MAX -#define INT16_MIN _I16_MIN -#endif +typedef unsigned int uint32_t; #ifndef _UINTPTR_T_DEFINED typedef size_t uintptr_t; @@ -40,18 +40,24 @@ typedef size_t uintptr_t; /* Most platforms have the C99 standard integer types. */ -#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) +#if defined(__cplusplus) +#if !defined(__STDC_FORMAT_MACROS) #define __STDC_FORMAT_MACROS #endif +#if !defined(__STDC_LIMIT_MACROS) +#define __STDC_LIMIT_MACROS +#endif +#endif // __cplusplus + #include <stdint.h> #endif /* VS2010 defines stdint.h, but not inttypes.h */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1800 #define PRId64 "I64d" #else #include <inttypes.h> #endif -#endif +#endif // VPX_VPX_INTEGER_H_ |