From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 18 Apr 2013 15:40:20 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3855
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24be3bfe878eb60f274a64e4400bc2f908775427;p=imagemagick

---

diff --git a/MagickCore/memory-private.h b/MagickCore/memory-private.h
index 72d7d6372..bf89233c4 100644
--- a/MagickCore/memory-private.h
+++ b/MagickCore/memory-private.h
@@ -32,11 +32,15 @@ extern "C" {
 #define CacheAlign(size)  ((size) < CACHE_LINE_SIZE ? CACHE_LINE_SIZE : (size))
 
 #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
+#if !defined(__ICC)
 #define MagickAssumeAligned(address) \
   __builtin_assume_aligned((address),CACHE_LINE_SIZE)
 #else
 #define MagickAssumeAligned(address)  (address)
 #endif
+#else
+#define MagickAssumeAligned(address)  (address)
+#endif
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }