Bug 1000858 - Fix r_gettimeint on win32 which prevented us from sending TURN allocations. r=ekr, a=lsblakk
authorByron Campen [:bwc] <docfaraday@gmail.com>
Thu, 24 Apr 2014 16:56:00 -0700
changeset 192155 dc37cd737acd4143d3f2c0d25d1dde32e7f603c4
parent 192154 3debec91f196b886d5a94cdce858d63ef5349181
child 192156 00f528e4aaa6466d4b1d8eefd8fa77ce8480aa36
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersekr, lsblakk
bugs1000858
milestone30.0a2
Bug 1000858 - Fix r_gettimeint on win32 which prevented us from sending TURN allocations. r=ekr, a=lsblakk
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;