Backed out changeset ccf9a31fe40d (bug 1284803)
authorIris Hsiao <ihsiao@mozilla.com>
Tue, 26 Jul 2016 10:22:24 +0800
changeset 346664 a3667f0527adaf730a8c406368e5f85a665d9be4
parent 346663 7a5831b9072315d4df182c06368919f5b0d45792
child 346665 b1e3ccab90a94a3bca6a9af49e994d2a2748c0de
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1284803
milestone50.0a1
backs outccf9a31fe40d327d53eb1c46aad7ee3c6ff4da5e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ccf9a31fe40d (bug 1284803)
media/libyuv/include/libyuv/basic_types.h
--- a/media/libyuv/include/libyuv/basic_types.h
+++ b/media/libyuv/include/libyuv/basic_types.h
@@ -8,36 +8,22 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_  // NOLINT
 #define INCLUDE_LIBYUV_BASIC_TYPES_H_
 
 #include <stddef.h>  // for NULL, size_t
 
-#if !(defined(_MSC_VER) && (_MSC_VER < 1600))
+#if defined(__ANDROID__) || (defined(_MSC_VER) && (_MSC_VER < 1600))
+#include <sys/types.h>  // for uintptr_t on x86
+#else
 #include <stdint.h>  // for uintptr_t
 #endif
 
-typedef uint64_t uint64;
-typedef int64_t  int64;
-#if defined(_MSC_VER)
-// nsprpub/pr/include/obsolete/protypes.h defines these weirdly
-typedef long int32;
-typedef unsigned long uint32;
-#else
-typedef uint32_t uint32;
-typedef int32_t  int32;
-#endif
-typedef uint16_t uint16;
-typedef int16_t  int16;
-typedef uint8_t  uint8;
-typedef int8_t   int8;
-#define INT_TYPES_DEFINED 1
-
 #ifndef GG_LONGLONG
 #ifndef INT_TYPES_DEFINED
 #define INT_TYPES_DEFINED
 #ifdef COMPILER_MSVC
 typedef unsigned __int64 uint64;
 typedef __int64 int64;
 #ifndef INT64_C
 #define INT64_C(x) x ## I64