From: Andreas Schneider Date: Mon, 30 Mar 2015 16:12:02 +0000 (+0200) Subject: include: Avoid redefinition of ALIGN X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=107c5289b1def80da6c7692b7654eaaa8d64007e;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_openmax.git include: Avoid redefinition of ALIGN Change-Id: Icd48935357c1ceb2aac4bcdee4e5a57621f61b93 Signed-off-by: Andreas Schneider --- diff --git a/include/exynos/Exynos_OMX_Macros.h b/include/exynos/Exynos_OMX_Macros.h index 8c56c95..be3207e 100644 --- a/include/exynos/Exynos_OMX_Macros.h +++ b/include/exynos/Exynos_OMX_Macros.h @@ -34,7 +34,9 @@ /* * MACROS */ +#ifndef ALIGN #define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#endif #define ALIGN_TO_16B(x) ((((x) + (1 << 4) - 1) >> 4) << 4) #define ALIGN_TO_32B(x) ((((x) + (1 << 5) - 1) >> 5) << 5) #define ALIGN_TO_128B(x) ((((x) + (1 << 7) - 1) >> 7) << 7) diff --git a/osal/Exynos_OSAL_Android.cpp b/osal/Exynos_OSAL_Android.cpp index 1efad2b..c87068b 100644 --- a/osal/Exynos_OSAL_Android.cpp +++ b/osal/Exynos_OSAL_Android.cpp @@ -41,12 +41,12 @@ #include #endif +#include "exynos_format.h" #include "Exynos_OSAL_Semaphore.h" #include "Exynos_OMX_Baseport.h" #include "Exynos_OMX_Basecomponent.h" #include "Exynos_OMX_Macros.h" #include "Exynos_OSAL_Android.h" -#include "exynos_format.h" #include "ExynosVideoApi.h"