include: Avoid redefinition of ALIGN

Change-Id: Icd48935357c1ceb2aac4bcdee4e5a57621f61b93
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

diff --git a/include/exynos/Exynos_OMX_Macros.h b/include/exynos/Exynos_OMX_Macros.h
index 8c56c957a99b06869f9d8b7ae91f584bc01116e7..be3207e5067ac4d6b4d02777dc53daaefe5dc07b 100644 (file)
--- 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 1efad2b047f522e2d6c02bc8a87737f2c61d11b0..c87068b9bf9b481a90c665c48cfd840aa1cb4701 100644 (file)
--- a/osal/Exynos_OSAL_Android.cpp
+++ b/osal/Exynos_OSAL_Android.cpp
@@ -41,12 +41,12 @@
 #include <gralloc_priv.h>
 #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"