From 920151f2b5bab5adc5e81df94ec59e82856b6f37 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 22 Aug 2016 16:16:49 -0700 Subject: [PATCH] Change basic_types.h for fixing build failure BUG=libyuv:630 TBR=harryjin@google.com TEST=android build locally tested. Review URL: https://codereview.chromium.org/2225763003 . Review URL: https://codereview.chromium.org/2269793002 . --- README.chromium | 2 +- include/libyuv/basic_types.h | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index df3999f76..cf911fea9 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1609 +Version: 1611 License: BSD License File: LICENSE diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h index beb750ba6..54a218143 100644 --- a/include/libyuv/basic_types.h +++ b/include/libyuv/basic_types.h @@ -13,7 +13,7 @@ #include // for NULL, size_t -#if defined(__ANDROID__) || (defined(_MSC_VER) && (_MSC_VER < 1600)) +#if defined(_MSC_VER) && (_MSC_VER < 1600) #include // for uintptr_t on x86 #else #include // for uintptr_t diff --git a/include/libyuv/version.h b/include/libyuv/version.h index dc304c085..c0081dbfb 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1609 +#define LIBYUV_VERSION 1611 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT