From 97dfe7e46bea767805a993ce78016887ee156aad Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 18 Oct 2013 16:49:17 +0200 Subject: [PATCH] * grub-core/fs/zfs/zfs_lz4.c: Check that __INTEL_COMPILER is defined before trying to use it. --- ChangeLog | 5 +++++ grub-core/fs/zfs/zfs_lz4.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b02bdf9c2..6f852397f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-18 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs_lz4.c: Check that __INTEL_COMPILER is + defined before trying to use it. + 2013-10-18 Vladimir Serbinenko * 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 980a25440..dde2c7195 100644 --- 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)