diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-01-30 21:53:37 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-01-30 21:53:41 +1100 |
| commit | 57297eea26485d367ed01c148759156dbe93ff16 (patch) | |
| tree | a120d3faf6d855f3655e5ae35c9a788812ca268e /src | |
| parent | d40e986a1e797bbacaca687d4a9c007a1074a6c6 (diff) | |
| download | flac-57297eea26485d367ed01c148759156dbe93ff16.tar.gz | |
Add __INTEL_COMPILER to _MSC_VER #ifdefs.
Patch-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libFLAC/cpu.c | 2 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder_intrin_sse2.c | 4 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder_intrin_ssse3.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c index e15689dd..09203172 100644 --- a/src/libFLAC/cpu.c +++ b/src/libFLAC/cpu.c @@ -450,7 +450,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx) { -#if defined _MSC_VER +#if defined _MSC_VER || defined __INTEL_COMPILER int cpuinfo[4]; __cpuid(cpuinfo, 1); *flags_ecx = cpuinfo[2]; diff --git a/src/libFLAC/stream_encoder_intrin_sse2.c b/src/libFLAC/stream_encoder_intrin_sse2.c index 9852175a..34a66f89 100644 --- a/src/libFLAC/stream_encoder_intrin_sse2.c +++ b/src/libFLAC/stream_encoder_intrin_sse2.c @@ -70,7 +70,7 @@ void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual if(e1 > end) e1 = end; /* try flac -l 1 -b 16 and you'll be here */ - /* assumption: residual[] is properly aligned so (residual + e1) is properly aligned too and _mm_loadu_si128() is fast*/ + /* assumption: residual[] is properly aligned so (residual + e1) is properly aligned too and _mm_loadu_si128() is fast */ for( ; residual_sample < e1; residual_sample++) abs_residual_partition_sum += abs(residual[residual_sample]); /* abs(INT_MIN) is undefined, but if the residual is INT_MIN we have bigger problems */ @@ -121,7 +121,7 @@ void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual mm_sum = _mm_add_epi64(mm_sum, _mm_srli_si128(mm_sum, 8)); #ifdef FLAC__CPU_IA32 -#ifdef _MSC_VER +#if defined _MSC_VER || defined __INTEL_COMPILER abs_residual_partition_sum += mm_sum.m128i_u64[0]; #else { diff --git a/src/libFLAC/stream_encoder_intrin_ssse3.c b/src/libFLAC/stream_encoder_intrin_ssse3.c index 7294c554..b858dc7a 100644 --- a/src/libFLAC/stream_encoder_intrin_ssse3.c +++ b/src/libFLAC/stream_encoder_intrin_ssse3.c @@ -70,7 +70,7 @@ void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residua if(e1 > end) e1 = end; /* try flac -l 1 -b 16 and you'll be here */ - /* assumption: residual[] is properly aligned so (residual + e1) is properly aligned too and _mm_loadu_si128() is fast*/ + /* assumption: residual[] is properly aligned so (residual + e1) is properly aligned too and _mm_loadu_si128() is fast */ for( ; residual_sample < e1; residual_sample++) abs_residual_partition_sum += abs(residual[residual_sample]); /* abs(INT_MIN) is undefined, but if the residual is INT_MIN we have bigger problems */ @@ -117,7 +117,7 @@ void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residua mm_sum = _mm_add_epi64(mm_sum, _mm_srli_si128(mm_sum, 8)); #ifdef FLAC__CPU_IA32 -#ifdef _MSC_VER +#if defined _MSC_VER || defined __INTEL_COMPILER abs_residual_partition_sum += mm_sum.m128i_u64[0]; #else { |