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

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

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx/vpx_codec.mk ('k') | source/libvpx/vpx_mem/include/vpx_mem_intrnl.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
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) && (_MSC_VER < 1600)) || 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) && (_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 #endif 31 #endif
31 32
32 #ifndef _UINTPTR_T_DEFINED 33 #ifndef _UINTPTR_T_DEFINED
33 typedef size_t uintptr_t; 34 typedef size_t uintptr_t;
34 #endif 35 #endif
35 36
36 #else 37 #else
37 38
38 /* Most platforms have the C99 standard integer types. */ 39 /* Most platforms have the C99 standard integer types. */
39 40
40 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) 41 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
41 #define __STDC_FORMAT_MACROS 42 #define __STDC_FORMAT_MACROS
42 #endif 43 #endif
43 #include <stdint.h> 44 #include <stdint.h>
44 45
45 #endif 46 #endif
46 47
47 /* VS2010 defines stdint.h, but not inttypes.h */ 48 /* VS2010 defines stdint.h, but not inttypes.h */
48 #if defined(_MSC_VER) 49 #if defined(_MSC_VER)
49 #define PRId64 "I64d" 50 #define PRId64 "I64d"
50 #else 51 #else
51 #include <inttypes.h> 52 #include <inttypes.h>
52 #endif 53 #endif
53 54
54 #endif 55 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vpx_codec.mk ('k') | source/libvpx/vpx_mem/include/vpx_mem_intrnl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698