Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: source/libvpx/vpx_ports/x86.h

Issue 478033002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 4 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:
View side-by-side diff with in-line comments
Download patch
Index: source/libvpx/vpx_ports/x86.h
===================================================================
--- source/libvpx/vpx_ports/x86.h (revision 290053)
+++ source/libvpx/vpx_ports/x86.h (working copy)
@@ -116,7 +116,7 @@
#define BIT(n) (1<<n)
#endif
-static int
+static INLINE int
x86_simd_caps(void) {
unsigned int flags = 0;
unsigned int mask = ~0;
@@ -172,7 +172,7 @@
unsigned __int64 __rdtsc(void);
#pragma intrinsic(__rdtsc)
#endif
-static unsigned int
+static INLINE unsigned int
x86_readtsc(void) {
#if defined(__GNUC__) && __GNUC__
unsigned int tsc;
@@ -249,9 +249,9 @@
}
#endif
-static unsigned short
+static INLINE unsigned int
x87_set_double_precision(void) {
- unsigned short mode = x87_get_control_word();
+ unsigned int mode = x87_get_control_word();
x87_set_control_word((mode&~0x300) | 0x200);
return mode;
}
« no previous file with comments | « source/libvpx/vpx_ports/vpx_timer.h ('k') | source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698