| 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 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 #ifndef _UINTPTR_T_DEFINED | 44 #ifndef _UINTPTR_T_DEFINED |
| 45 typedef size_t uintptr_t; | 45 typedef size_t uintptr_t; |
| 46 #endif | 46 #endif |
| 47 | 47 |
| 48 #else | 48 #else |
| 49 | 49 |
| 50 /* Most platforms have the C99 standard integer types. */ | 50 /* Most platforms have the C99 standard integer types. */ |
| 51 | 51 |
| 52 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) | 52 #if defined(__cplusplus) |
| 53 #define __STDC_FORMAT_MACROS | 53 # if !defined(__STDC_FORMAT_MACROS) |
| 54 #endif | 54 # define __STDC_FORMAT_MACROS |
| 55 # endif |
| 56 # if !defined(__STDC_LIMIT_MACROS) |
| 57 # define __STDC_LIMIT_MACROS |
| 58 # endif |
| 59 #endif // __cplusplus |
| 60 |
| 55 #include <stdint.h> | 61 #include <stdint.h> |
| 56 | 62 |
| 57 #endif | 63 #endif |
| 58 | 64 |
| 59 /* VS2010 defines stdint.h, but not inttypes.h */ | 65 /* VS2010 defines stdint.h, but not inttypes.h */ |
| 60 #if defined(_MSC_VER) && _MSC_VER < 1800 | 66 #if defined(_MSC_VER) && _MSC_VER < 1800 |
| 61 #define PRId64 "I64d" | 67 #define PRId64 "I64d" |
| 62 #else | 68 #else |
| 63 #include <inttypes.h> | 69 #include <inttypes.h> |
| 64 #endif | 70 #endif |
| 65 | 71 |
| 66 #endif // VPX_VPX_INTEGER_H_ | 72 #endif // VPX_VPX_INTEGER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 668403002:
libvpx: Pull from upstream (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/