[tor-commits] [tor/master] Avoid a compilation warning on macOS in scheduler_ev_add()

[nickm@xxxxxxxxxxxxxx]

commit e77ece3b31e9e16d576f28e6f19b3c74599b2b1c
Author: teor <teor2345@xxxxxxxxx>
Date:   Tue Sep 19 16:32:47 2017 +1000

    Avoid a compilation warning on macOS in scheduler_ev_add()
    
    This warning is caused by a different tv_usec data type on macOS
    compared to the system on which the patch was developed.
    
    Fixes 23575 on 0.3.2.1-alpha.
---
 changes/bug23575   | 4 ++++
 src/or/scheduler.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug23575 b/changes/bug23575
new file mode 100644
index 000000000..2e63e6d6c
--- /dev/null
+++ b/changes/bug23575
@@ -0,0 +1,4 @@
+  o Minor bugfixes (scheduler):
+    - Avoid a compilation warning on macOS in scheduler_ev_add() caused by
+      a different tv_usec data type.
+      Fixes 23575 on 0.3.2.1-alpha.
diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 43fff2bf2..ca3cafd9a 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -508,7 +508,7 @@ scheduler_ev_add(const struct timeval *next_run)
   tor_assert(next_run);
   if (BUG(event_add(run_sched_ev, next_run) < 0)) {
     log_warn(LD_SCHED, "Adding to libevent failed. Next run time was set to: "
-                       "%ld.%06ld", next_run->tv_sec, next_run->tv_usec);
+                       "%ld.%06ld", next_run->tv_sec, (long)next_run->tv_usec);
     return;
   }
 }

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits