mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues 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 orconfig.h
ext/tor_queue.h ext/tor_queue.h
timeout-bitops.c ext/timeouts/*.h
timeout-debug.h ext/timeouts/timeout-bitops.c
timeout.h

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

@ -4,7 +4,7 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include "timeout.h" #include "ext/timeouts/timeout.h"
#define THE_END_OF_TIME ((timeout_t)-1) #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 "ext/tor_queue.h" /* TAILQ(3) */
#include "timeout.h" #include "ext/timeouts/timeout.h"
#ifndef TIMEOUT_DEBUG #ifndef TIMEOUT_DEBUG
#define TIMEOUT_DEBUG 0 #define TIMEOUT_DEBUG 0
#endif #endif
#if TIMEOUT_DEBUG - 0 #if TIMEOUT_DEBUG - 0
#include "timeout-debug.h" #include "ext/timeouts/timeout-debug.h"
#endif #endif
#ifdef TIMEOUT_DISABLE_RELATIVE_ACCESS #ifdef TIMEOUT_DISABLE_RELATIVE_ACCESS
@ -141,7 +141,7 @@
#define WHEEL_MASK (WHEEL_LEN - 1) #define WHEEL_MASK (WHEEL_LEN - 1)
#define TIMEOUT_MAX ((TIMEOUT_C(1) << (WHEEL_BIT * WHEEL_NUM)) - 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 #if WHEEL_BIT == 6
#define ctz(n) ctz64(n) #define ctz(n) ctz64(n)