* grub-core/fs/zfs/zfs_lz4.c: Check that __INTEL_COMPILER is

	defined before trying to use it.

diff --git a/ChangeLog b/ChangeLog
index b02bdf9c2cf50880460fdf1306c1f8707b5879d8..6f852397ff5077e86da7025070ef8d26b7504856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfs_lz4.c: Check that __INTEL_COMPILER is
+       defined before trying to use it.
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/affs.c (grub_affs_create_node): Fix uninited value

diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c
index 980a25440bebc971460bedf17f9f54fe32ad8452..dde2c7195372927eb128fc41a4cfff2b293a196e 100644 (file)
--- a/grub-core/fs/zfs/zfs_lz4.c
+++ b/grub-core/fs/zfs/zfs_lz4.c
@@ -58,7 +58,7 @@ static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
 
 #define        GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
 
-#if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
+#if (GCC_VERSION >= 302) || (defined (__INTEL_COMPILER) && __INTEL_COMPILER >= 800) || defined(__clang__)
 #define        expect(expr, value)    (__builtin_expect((expr), (value)))
 #else
 #define        expect(expr, value)    (expr)