Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-06-05 19:11:22 +03:00
parent e329c84d5e 51631b90af
commit f3de2b4be7
155 changed files with 5856 additions and 1800 deletions
@@ -755,8 +755,7 @@ int64 getTickCount(void)
    return (int64)mach_absolute_time();
 #else
    struct timeval tv;
-    struct timezone tz;
-    gettimeofday( &tv, &tz );
+    gettimeofday(&tv, NULL);
    return (int64)tv.tv_sec*1000000 + tv.tv_usec;
 #endif
 }