celt/float_cast.h - Issue 882843002: Update to opus-HEAD-66611f1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: celt/float_cast.h

Issue 882843002: Update to opus-HEAD-66611f1. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/opus.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: celt/float_cast.h

diff --git a/celt/float_cast.h b/celt/float_cast.h

index ede6574860cf70e9a588101a582afa9ed0428ff1..ed5a39b5433b58f2fa08432d2eb6189d6cbe8f6c 100644

--- a/celt/float_cast.h

+++ b/celt/float_cast.h

@@ -90,14 +90,14 @@

#include <math.h>

#define float2int(x) lrint(x)

-#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined (WIN64) || defined (_WIN64))

+#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_X64)

#include <xmmintrin.h>

__inline long int float2int(float value)

{

return _mm_cvtss_si32(_mm_load_ss(&value));

}

-#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined (WIN32) || defined (_WIN32))

+#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_IX86)

#include <math.h>

/* Win32 doesn't seem to have these functions.