diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 12:52:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 12:52:43 -0400 |
| commit | df98582851a92d514c04061a5e0ec762c17a0cfb (patch) | |
| tree | b52518169d65be6773a5abb606f3f56b5b8c9d25 /src/test/test_circuitmux.c | |
| parent | fe8f7748202816a9b90e04db542e449145283a66 (diff) | |
| parent | 02a4442524d84ea7edf6e3f136017faa73452d92 (diff) | |
| download | tor-df98582851a92d514c04061a5e0ec762c17a0cfb.tar.gz tor-df98582851a92d514c04061a5e0ec762c17a0cfb.zip | |
Merge remote-tracking branch 'github/ticket26626'
Diffstat (limited to 'src/test/test_circuitmux.c')
| -rw-r--r-- | src/test/test_circuitmux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index 8a89927df9..c2fd1ae68a 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -86,7 +86,7 @@ static void test_cmux_compute_ticks(void *arg) { const int64_t NS_PER_S = 1000 * 1000 * 1000; - const int64_t START_NS = U64_LITERAL(1217709000)*NS_PER_S; + const int64_t START_NS = UINT64_C(1217709000)*NS_PER_S; int64_t now; double rem; unsigned tick; |