libvpx: Pull from upstream

source/libvpx/vpx_ports/vpx_timer.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 35 matching lines @@
 
 struct vpx_usec_timer {
 #if defined(_WIN32)
   LARGE_INTEGER  begin, end;
 #else
   struct timeval begin, end;
 #endif
 };
 
 
-static void
+static INLINE void
 vpx_usec_timer_start(struct vpx_usec_timer *t) {
 #if defined(_WIN32)
   QueryPerformanceCounter(&t->begin);
 #else
   gettimeofday(&t->begin, NULL);
 #endif
 }
 
 
-static void
+static INLINE void
 vpx_usec_timer_mark(struct vpx_usec_timer *t) {
 #if defined(_WIN32)
   QueryPerformanceCounter(&t->end);
 #else
   gettimeofday(&t->end, NULL);
 #endif
 }
 
 
-static int64_t
+static INLINE int64_t
 vpx_usec_timer_elapsed(struct vpx_usec_timer *t) {
 #if defined(_WIN32)
   LARGE_INTEGER freq, diff;
 
   diff.QuadPart = t->end.QuadPart - t->begin.QuadPart;
 
   QueryPerformanceFrequency(&freq);
   return diff.QuadPart * 1000000 / freq.QuadPart;
 #else
   struct timeval diff;
 
   timersub(&t->end, &t->begin, &diff);
   return diff.tv_sec * 1000000 + diff.tv_usec;
 #endif
 }
 
 #else /* CONFIG_OS_SUPPORT = 0*/
 
 /* Empty timer functions if CONFIG_OS_SUPPORT = 0 */
 #ifndef timersub
 #define timersub(a, b, result)
 #endif
 
 struct vpx_usec_timer {
   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;
 }
 
 #endif /* CONFIG_OS_SUPPORT */
 
 #endif  // VPX_PORTS_VPX_TIMER_H_