[x265-commits] [x265] common: rename AILIGNBYTES to avoid conflict with apple i...

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/41e5e72e2a46
branches:  
changeset: 4272:41e5e72e2a46
user:      Steve Borho <steve at borho.org>
date:      Mon Oct 07 16:51:18 2013 -0500
description:
common: rename AILIGNBYTES to avoid conflict with apple i386/param.h

diffstat:

 source/common/common.cpp |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 5ff1a56ba33b -r 41e5e72e2a46 source/common/common.cpp
--- a/source/common/common.cpp	Mon Oct 07 16:01:45 2013 -0500
+++ b/source/common/common.cpp	Mon Oct 07 16:51:18 2013 -0500
@@ -48,7 +48,7 @@ const int x265_max_bit_depth = 8; // 12;
 const int x265_max_bit_depth = 8;
 #endif
 
-#define ALIGNBYTES 32
+#define X265_ALIGNBYTES 32
 
 #if _WIN32
 #if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
@@ -59,7 +59,7 @@ const int x265_max_bit_depth = 8;
 
 void *x265_malloc(size_t size)
 {
-    return _aligned_malloc(size, ALIGNBYTES);
+    return _aligned_malloc(size, X265_ALIGNBYTES);
 }
 
 void x265_free(void *ptr)
@@ -72,7 +72,7 @@ void *x265_malloc(size_t size)
 {
     void *ptr;
 
-    if (posix_memalign((void**)&ptr, ALIGNBYTES, size) == 0)
+    if (posix_memalign((void**)&ptr, X265_ALIGNBYTES, size) == 0)
         return ptr;
     else
         return NULL;