From dd46dac03a04be46de794e2c7a2bb4b0ec0869cd Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Sun, 30 Sep 2012 19:08:23 +0000 Subject: [PATCH] ALIGNP test if ALIGNP is already defined to avoid a redefine. Allows new ALIGNP to coexist with old libjingle version of ALIGNP when integrating into chromium. BUG=104 TEST=build chromium against libyuv Review URL: https://webrtc-codereview.appspot.com/857004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@381 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/basic_types.h | 2 ++ include/libyuv/version.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.chromium b/README.chromium index a1f021c4f..05683b863 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 380 +Version: 381 License: BSD License File: LICENSE diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h index 73c82c8ce..5b9a6172b 100644 --- a/include/libyuv/basic_types.h +++ b/include/libyuv/basic_types.h @@ -70,9 +70,11 @@ typedef signed char int8; #define CPU_ARM 1 #endif +#ifndef ALIGNP #define ALIGNP(p, t) \ (reinterpret_cast(((reinterpret_cast(p) + \ ((t) - 1)) & ~((t) - 1)))) +#endif #if !defined(LIBYUV_API) #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f72313dfc..b5e537e19 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 380 +#define LIBYUV_VERSION 381 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT