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

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

Issue 13849011: libvpx: Pull from upstream (Closed) Base URL: https://src.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 8 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/vp8dx.h ('k') | source/libvpx/vpx_ports/mem.h » ('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 10 matching lines...) Expand all
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) && (_MSC_VER < 1600)) 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 INT64_MAX _I64_MAX 30 #define INT64_MAX _I64_MAX
31 #define INT16_MAX _I16_MAX
32 #define INT16_MIN _I16_MIN
31 #endif 33 #endif
32 34
33 #ifndef _UINTPTR_T_DEFINED 35 #ifndef _UINTPTR_T_DEFINED
34 typedef size_t uintptr_t; 36 typedef size_t uintptr_t;
35 #endif 37 #endif
36 38
37 #else 39 #else
38 40
39 /* Most platforms have the C99 standard integer types. */ 41 /* Most platforms have the C99 standard integer types. */
40 42
41 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) 43 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
42 #define __STDC_FORMAT_MACROS 44 #define __STDC_FORMAT_MACROS
43 #endif 45 #endif
44 #include <stdint.h> 46 #include <stdint.h>
45 47
46 #endif 48 #endif
47 49
48 /* VS2010 defines stdint.h, but not inttypes.h */ 50 /* VS2010 defines stdint.h, but not inttypes.h */
49 #if defined(_MSC_VER) 51 #if defined(_MSC_VER)
50 #define PRId64 "I64d" 52 #define PRId64 "I64d"
51 #else 53 #else
52 #include <inttypes.h> 54 #include <inttypes.h>
53 #endif 55 #endif
54 56
55 #endif 57 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vp8dx.h ('k') | source/libvpx/vpx_ports/mem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698