Bug 1000858: Fix r_gettimeint on win32 which prevented us from sending TURN allocations r=ekr
authorByron Campen [:bwc] <docfaraday@gmail.com>
Thu, 24 Apr 2014 16:56:00 -0700
changeset 198809 83ea7136632f68f79060880bc3ae41a2573e8880
parent 198681 787663bcaf04badfa24eed19bb3af48752bbea10
child 198810 74d6c877ed64e109767207d426db196d75ca3ba3
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersekr
bugs1000858
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1000858: Fix r_gettimeint on win32 which prevented us from sending TURN allocations r=ekr
media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c
--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c
@@ -172,25 +172,19 @@ int r_int2timeval(UINT8 t,struct timeval
     tv->tv_sec=t/1000000;
     tv->tv_usec=t%1000000;
 
     return(0);
   }
 
 UINT8 r_gettimeint()
   {
-
-#ifdef WIN32
-    struct timeval tv = {0,0};
-
-#else
     struct timeval tv;
 
     gettimeofday(&tv,0);
-#endif
 
     return r_timeval2int(&tv);
   }
 
 /* t1-t0 in microseconds */
 int r_timeval_diff_usec(struct timeval *t1, struct timeval *t0, INT8 *diff)
   {
     int r,_status;