From 9ccae7b0d67997216ae804beaebcd15a6a6ffe06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 10 Jan 2014 12:25:39 +0200
Subject: [PATCH] Remove useless use of the HAVE_CACHE_LINE_ALIGN define

The code ends up as the exact same regardless of whether the
define is set or not.
---
 codec/decoder/core/inc/mem_align.h   | 2 --
 codec/decoder/core/src/mem_align.cpp | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/codec/decoder/core/inc/mem_align.h b/codec/decoder/core/inc/mem_align.h
index 03696e6e..fc2de1f8 100644
--- a/codec/decoder/core/inc/mem_align.h
+++ b/codec/decoder/core/inc/mem_align.h
@@ -42,8 +42,6 @@
 
 namespace WelsDec {
 
-//#define CACHE_LINE 64
-
 #ifdef __cplusplus
 extern "C" {
 #endif//__cplusplus
diff --git a/codec/decoder/core/src/mem_align.cpp b/codec/decoder/core/src/mem_align.cpp
index 006cc9fa..84f23f6f 100644
--- a/codec/decoder/core/src/mem_align.cpp
+++ b/codec/decoder/core/src/mem_align.cpp
@@ -45,18 +45,10 @@ int32_t iCountMalloc = 0;
 #endif
 //
 
-/////////////////////////////////////////////////////////////////////////////////
-#define ALIGNBYTES (16)
-/////////////////////////////////////////////////////////////////////////////////
-
 void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) {
   const int32_t kiSizeVoidPtr	= sizeof (void_t**);
   const int32_t kiSizeInt		= sizeof (int32_t);
-#ifdef HAVE_CACHE_LINE_ALIGN
-  const int32_t kiAlignBytes	= ALIGNBYTES - 1;
-#else
   const int32_t kiAlignBytes	= 15;
-#endif// HAVE_CACHE_LINE_ALIGN
   uint8_t* pBuf		= (uint8_t*) malloc (kuiSize + kiAlignBytes + kiSizeVoidPtr + kiSizeInt);
   uint8_t* pAlignBuf;