source/libvpx/vpx/vpx_integer.h - Issue 7671004: Update libvpx snapshot to v0.9.7-p1 (Cayuga).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/vpx/vpx_integer.h

Issue 7671004: Update libvpx snapshot to v0.9.7-p1 (Cayuga). (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: '' Created 9 years, 4 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:

Index: source/libvpx/vpx/vpx_integer.h

===================================================================

--- source/libvpx/vpx/vpx_integer.h (revision 96967)

+++ source/libvpx/vpx/vpx_integer.h (working copy)

@@ -15,7 +15,7 @@

/* get ptrdiff_t, size_t, wchar_t, NULL */

#include <stddef.h>

-#if defined(_MSC_VER) || defined(VPX_EMULATE_INTTYPES)

+#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES)

typedef signed char int8_t;

typedef signed short int16_t;

typedef signed int int32_t;

@@ -24,10 +24,9 @@

typedef unsigned short uint16_t;

typedef unsigned int uint32_t;

-#if defined(_MSC_VER)

+#if (defined(_MSC_VER) && (_MSC_VER < 1600))

typedef signed __int64 int64_t;

typedef unsigned __int64 uint64_t;

-#define PRId64 "I64d"

#endif

#ifdef HAVE_ARMV6

@@ -50,8 +49,14 @@

#define __STDC_FORMAT_MACROS

#endif

#include <stdint.h>

-#include <inttypes.h>

#endif

+/* VS2010 defines stdint.h, but not inttypes.h */

+#if defined(_MSC_VER)

+#define PRId64 "I64d"

+#else

+#include <inttypes.h>

#endif

+#endif

« no previous file with comments | « source/libvpx/vpx/vpx_encoder.h ('k') | source/libvpx/vpx_mem/include/nds/vpx_mem_nds.h » ('j') | no next file with comments »