nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/866'

Browse Source
This commit is contained in:
teor 2019-04-09 11:36:38 +10:00
commit e4692fad96
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ext/timeouts/.may_include
View File

@ -1,6 +1,5 @@
orconfig.h
ext/tor_queue.h
timeout-bitops.c
timeout-debug.h
timeout.h
ext/timeouts/*.h
ext/timeouts/timeout-bitops.c

2
src/ext/timeouts/test-timeout.c
View File

@ -4,7 +4,7 @@
#include <assert.h>
#include <limits.h>
#include "timeout.h"
#include "ext/timeouts/timeout.h"
#define THE_END_OF_TIME ((timeout_t)-1)

6
src/ext/timeouts/timeout.c
View File

@ -40,14 +40,14 @@
#include "ext/tor_queue.h" /* TAILQ(3) */
#include "timeout.h"
#include "ext/timeouts/timeout.h"
#ifndef TIMEOUT_DEBUG
#define TIMEOUT_DEBUG 0
#endif
#if TIMEOUT_DEBUG - 0
#include "timeout-debug.h"
#include "ext/timeouts/timeout-debug.h"
#endif
#ifdef TIMEOUT_DISABLE_RELATIVE_ACCESS
@ -141,7 +141,7 @@
#define WHEEL_MASK (WHEEL_LEN - 1)
#define TIMEOUT_MAX ((TIMEOUT_C(1) << (WHEEL_BIT * WHEEL_NUM)) - 1)
#include "timeout-bitops.c"
#include "ext/timeouts/timeout-bitops.c"
#if WHEEL_BIT == 6
#define ctz(n) ctz64(n)