Merge commit '3757253' into bfgminer

logging.c

@@ -65,7 +65,6 @@ void _applog(int prio, const char *str)
 			struct timeval tv;
 			struct tm tm;
 			
-			bfg_init_time();
 			bfg_gettimeofday(&tv);
 			localtime_r(&tv.tv_sec, &tm);
 			

miner.c

@@ -568,7 +568,6 @@ struct pool *add_pool(void)
 	/* Make sure the pool doesn't think we've been idle since time 0 */
 	pool->tv_idle.tv_sec = ~0UL;
 	
-	bfg_init_time();
 	cgtime(&pool->cgminer_stats.start_tv);
 
 	pool->rpc_proxy = NULL;
@@ -9936,7 +9935,6 @@ int main(int argc, char *argv[])
 #endif
 
 	raise_fd_limits();
-	bfg_init_time();
 	
 	if (opt_benchmark) {
 		struct pool *pool;

util.c

@@ -1109,11 +1109,13 @@ void _now_queryperformancecounter(struct timeval *tv)
 }
 #endif
 
+static void bfg_init_time();
+
 static
 void _now_is_not_set(__maybe_unused struct timeval *tv)
 {
-	// Might be unclean to swap algorithms after getting a timer
-	quit(1, "timer_set_now called before bfg_init_time");
+	bfg_init_time();
+	timer_set_now(tv);
 }
 
 void (*timer_set_now)(struct timeval *tv) = _now_is_not_set;
@@ -1164,6 +1166,7 @@ bool _bfg_try_clock_gettime(clockid_t clk)
 }
 #endif
 
+static
 void bfg_init_time()
 {
 	if (timer_set_now != _now_is_not_set)

util.h

@@ -305,7 +305,6 @@ bool timer_isset(const struct timeval *tvp)
 }
 
 extern void (*timer_set_now)(struct timeval *);
-extern void bfg_init_time();
 #define cgtime(tvp)  timer_set_now(tvp)
 
 #define TIMEVAL_USECS(usecs)  (  \