commit 83b1d907daef1db08834093806f125e56fba3370
author John Koleszar <jkoleszar@google.com> Mon Nov 05 12:37:14 2012 -0800
committer John Koleszar <jkoleszar@google.com> Tue Nov 06 12:04:53 2012 -0800
tree 11831ecc5fd5612b5e3b47e342cd2d752c9abfc3
parent 807acf17baf7ba839ecc0038cdaee5d17964e612

vpx: merge with master

Change-Id: I44b3ad780cef6f448fa17ff8e28fea87ef9cd518

vpx/vpx_integer.h

diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h
index 608760f..218bca7 100644
--- a/vpx/vpx_integer.h
+++ b/vpx/vpx_integer.h
@@ -29,16 +29,8 @@
 typedef unsigned __int64 uint64_t;
 #endif
 
-#ifdef HAVE_ARMV6
-typedef unsigned int int_fast16_t;
-#else
-typedef signed short int_fast16_t;
-#endif
-typedef signed char int_fast8_t;
-typedef unsigned char uint_fast8_t;
-
 #ifndef _UINTPTR_T_DEFINED
-typedef unsigned int   uintptr_t;
+typedef size_t uintptr_t;
 #endif
 
 #else