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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/libvpx/vpx_ports/vpx_timer.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
« no previous file with comments | « source/libvpx/vpx_ports/vpx_once.h ('k') | source/libvpx/vpx_ports/x86.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpx_ports/vpx_timer.h
===================================================================
--- source/libvpx/vpx_ports/vpx_timer.h (revision 290053)
+++ source/libvpx/vpx_ports/vpx_timer.h (working copy)
@@ -53,7 +53,7 @@
};
-static void
+static INLINE void
vpx_usec_timer_start(struct vpx_usec_timer *t) {
#if defined(_WIN32)
QueryPerformanceCounter(&t->begin);
@@ -63,7 +63,7 @@
}
-static void
+static INLINE void
vpx_usec_timer_mark(struct vpx_usec_timer *t) {
#if defined(_WIN32)
QueryPerformanceCounter(&t->end);
@@ -73,7 +73,7 @@
}
-static int64_t
+static INLINE int64_t
vpx_usec_timer_elapsed(struct vpx_usec_timer *t) {
#if defined(_WIN32)
LARGE_INTEGER freq, diff;
@@ -101,13 +101,13 @@
void *dummy;
};
-static void
+static INLINE void
vpx_usec_timer_start(struct vpx_usec_timer *t) { }
-static void
+static INLINE void
vpx_usec_timer_mark(struct vpx_usec_timer *t) { }
-static long
+static INLINE int
vpx_usec_timer_elapsed(struct vpx_usec_timer *t) {
return 0;
}
« no previous file with comments | « source/libvpx/vpx_ports/vpx_once.h ('k') | source/libvpx/vpx_ports/x86.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698