diff options
| author | teor <teor@torproject.org> | 2019-11-15 12:11:32 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-15 12:11:32 +1000 |
| commit | 825f52784d875ee580fe82619302a21c958d77ea (patch) | |
| tree | 736def96fe63113f776b52a028551392b49d093d /src/feature | |
| parent | b58e5091b7f442568a10e949fec4ee901c809b12 (diff) | |
| parent | d19f370aa2dbffe72587b6af9f7119a36ea7c25a (diff) | |
| download | tor-825f52784d875ee580fe82619302a21c958d77ea.tar.gz tor-825f52784d875ee580fe82619302a21c958d77ea.zip | |
Merge remote-tracking branch 'tor-github/pr/1535'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/dirauth/dirauth_sys.h | 4 | ||||
| -rw-r--r-- | src/feature/relay/relay_periodic.h | 13 | ||||
| -rw-r--r-- | src/feature/relay/relay_sys.h | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/feature/dirauth/dirauth_sys.h b/src/feature/dirauth/dirauth_sys.h index 2d5a0cb3e7..86c8d8ba3e 100644 --- a/src/feature/dirauth/dirauth_sys.h +++ b/src/feature/dirauth/dirauth_sys.h @@ -12,6 +12,10 @@ #ifndef DIRAUTH_SYS_H #define DIRAUTH_SYS_H +#ifdef HAVE_MODULE_DIRAUTH + extern const struct subsys_fns_t sys_dirauth; +#endif + #endif /* !defined(DIRAUTH_SYS_H) */ diff --git a/src/feature/relay/relay_periodic.h b/src/feature/relay/relay_periodic.h index b6ea83c749..84bc8a9780 100644 --- a/src/feature/relay/relay_periodic.h +++ b/src/feature/relay/relay_periodic.h @@ -12,7 +12,20 @@ #ifndef TOR_FEATURE_RELAY_RELAY_PERIODIC_H #define TOR_FEATURE_RELAY_RELAY_PERIODIC_H +#ifdef HAVE_MODULE_RELAY + void relay_register_periodic_events(void); void reschedule_descriptor_update_check(void); +#else /* !defined(HAVE_MODULE_RELAY) */ + +#include "lib/cc/compat_compiler.h" + +#define relay_register_periodic_events() \ + STMT_NIL +#define reschedule_descriptor_update_check() \ + STMT_NIL + +#endif /* defined(HAVE_MODULE_RELAY) */ + #endif /* !defined(TOR_FEATURE_RELAY_RELAY_PERIODIC_H) */ diff --git a/src/feature/relay/relay_sys.h b/src/feature/relay/relay_sys.h index 32e21d90d8..aa387369b5 100644 --- a/src/feature/relay/relay_sys.h +++ b/src/feature/relay/relay_sys.h @@ -12,6 +12,10 @@ #ifndef TOR_FEATURE_RELAY_RELAY_SYS_H #define TOR_FEATURE_RELAY_RELAY_SYS_H +#ifdef HAVE_MODULE_RELAY + extern const struct subsys_fns_t sys_relay; +#endif + #endif /* !defined(TOR_FEATURE_RELAY_RELAY_SYS_H) */ |