From 8ef9e0dc4d71dd59d1739d2c8a0ec035ef5163a8 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 16 Nov 2012 19:35:17 +0000 Subject: [PATCH] ifdef around stdint on android for x86 builds BUG=none TEST=none Review URL: https://webrtc-codereview.appspot.com/930022 git-svn-id: http://libyuv.googlecode.com/svn/trunk@495 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/basic_types.h | 4 ++++ include/libyuv/version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.chromium b/README.chromium index 02405e289..d7b7ed19b 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 494 +Version: 495 License: BSD License File: LICENSE diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h index 3cf7693ba..2ebc333cd 100644 --- a/include/libyuv/basic_types.h +++ b/include/libyuv/basic_types.h @@ -14,8 +14,12 @@ #include // for NULL, size_t #if !(defined(_MSC_VER) && (_MSC_VER < 1600)) +#if defined(__ANDROID__) +#include // for uintptr_t on x86 +#else #include // for uintptr_t #endif +#endif #ifndef INT_TYPES_DEFINED #define INT_TYPES_DEFINED diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 8a877dcf0..b82ed3ae0 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 494 +#define LIBYUV_VERSION 495 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT