Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Side by Side Diff: source/libvpx/vpx/vpx_integer.h

Issue 958693004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/libvpx/vpx/vpx_frame_buffer.h ('k') | source/libvpx/vpx_scale/generic/yv12extend.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 typedef signed int int32_t; 30 typedef signed int int32_t;
31 31
32 typedef unsigned char uint8_t; 32 typedef unsigned char uint8_t;
33 typedef unsigned short uint16_t; 33 typedef unsigned short uint16_t;
34 typedef unsigned int uint32_t; 34 typedef unsigned int uint32_t;
35 35
36 #if (defined(_MSC_VER) && (_MSC_VER < 1600)) 36 #if (defined(_MSC_VER) && (_MSC_VER < 1600))
37 typedef signed __int64 int64_t; 37 typedef signed __int64 int64_t;
38 typedef unsigned __int64 uint64_t; 38 typedef unsigned __int64 uint64_t;
39 #define INT64_MAX _I64_MAX 39 #define INT64_MAX _I64_MAX
40 #define INT32_MAX _I32_MAX
41 #define INT32_MIN _I32_MIN
40 #define INT16_MAX _I16_MAX 42 #define INT16_MAX _I16_MAX
41 #define INT16_MIN _I16_MIN 43 #define INT16_MIN _I16_MIN
42 #endif 44 #endif
43 45
44 #ifndef _UINTPTR_T_DEFINED 46 #ifndef _UINTPTR_T_DEFINED
45 typedef size_t uintptr_t; 47 typedef size_t uintptr_t;
46 #endif 48 #endif
47 49
48 #else 50 #else
49 51
(...skipping 13 matching lines...) Expand all
63 #endif 65 #endif
64 66
65 /* VS2010 defines stdint.h, but not inttypes.h */ 67 /* VS2010 defines stdint.h, but not inttypes.h */
66 #if defined(_MSC_VER) && _MSC_VER < 1800 68 #if defined(_MSC_VER) && _MSC_VER < 1800
67 #define PRId64 "I64d" 69 #define PRId64 "I64d"
68 #else 70 #else
69 #include <inttypes.h> 71 #include <inttypes.h>
70 #endif 72 #endif
71 73
72 #endif // VPX_VPX_INTEGER_H_ 74 #endif // VPX_VPX_INTEGER_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vpx_frame_buffer.h ('k') | source/libvpx/vpx_scale/generic/yv12extend.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698