| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 | 11 |
| 12 #ifndef VPX_INTEGER_H | 12 #ifndef VPX_INTEGER_H |
| 13 #define VPX_INTEGER_H | 13 #define VPX_INTEGER_H |
| 14 | 14 |
| 15 /* get ptrdiff_t, size_t, wchar_t, NULL */ | 15 /* get ptrdiff_t, size_t, wchar_t, NULL */ |
| 16 #include <stddef.h> | 16 #include <stddef.h> |
| 17 | 17 |
| 18 #if defined(_MSC_VER) || defined(VPX_EMULATE_INTTYPES) | 18 #if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) |
| 19 typedef signed char int8_t; | 19 typedef signed char int8_t; |
| 20 typedef signed short int16_t; | 20 typedef signed short int16_t; |
| 21 typedef signed int int32_t; | 21 typedef signed int int32_t; |
| 22 | 22 |
| 23 typedef unsigned char uint8_t; | 23 typedef unsigned char uint8_t; |
| 24 typedef unsigned short uint16_t; | 24 typedef unsigned short uint16_t; |
| 25 typedef unsigned int uint32_t; | 25 typedef unsigned int uint32_t; |
| 26 | 26 |
| 27 #if defined(_MSC_VER) | 27 #if (defined(_MSC_VER) && (_MSC_VER < 1600)) |
| 28 typedef signed __int64 int64_t; | 28 typedef signed __int64 int64_t; |
| 29 typedef unsigned __int64 uint64_t; | 29 typedef unsigned __int64 uint64_t; |
| 30 #define PRId64 "I64d" | |
| 31 #endif | 30 #endif |
| 32 | 31 |
| 33 #ifdef HAVE_ARMV6 | 32 #ifdef HAVE_ARMV6 |
| 34 typedef unsigned int int_fast16_t; | 33 typedef unsigned int int_fast16_t; |
| 35 #else | 34 #else |
| 36 typedef signed short int_fast16_t; | 35 typedef signed short int_fast16_t; |
| 37 #endif | 36 #endif |
| 38 typedef signed char int_fast8_t; | 37 typedef signed char int_fast8_t; |
| 39 typedef unsigned char uint_fast8_t; | 38 typedef unsigned char uint_fast8_t; |
| 40 | 39 |
| 41 #ifndef _UINTPTR_T_DEFINED | 40 #ifndef _UINTPTR_T_DEFINED |
| 42 typedef unsigned int uintptr_t; | 41 typedef unsigned int uintptr_t; |
| 43 #endif | 42 #endif |
| 44 | 43 |
| 45 #else | 44 #else |
| 46 | 45 |
| 47 /* Most platforms have the C99 standard integer types. */ | 46 /* Most platforms have the C99 standard integer types. */ |
| 48 | 47 |
| 49 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) | 48 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) |
| 50 #define __STDC_FORMAT_MACROS | 49 #define __STDC_FORMAT_MACROS |
| 51 #endif | 50 #endif |
| 52 #include <stdint.h> | 51 #include <stdint.h> |
| 53 #include <inttypes.h> | |
| 54 | 52 |
| 55 #endif | 53 #endif |
| 56 | 54 |
| 55 /* VS2010 defines stdint.h, but not inttypes.h */ |
| 56 #if defined(_MSC_VER) |
| 57 #define PRId64 "I64d" |
| 58 #else |
| 59 #include <inttypes.h> |
| 57 #endif | 60 #endif |
| 61 |
| 62 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 7671004:
Update libvpx snapshot to v0.9.7-p1 (Cayuga). (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/