diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
| commit | c0391bae75e9eb71f5fa2ab24fc97792c204225d (patch) | |
| tree | 9701969423b86fdc2ba04080338d817c3b5c9864 /src/or/dirvote.h | |
| parent | 2cb59be9993ecec13ceabc0c4754e52f8c5ea4e5 (diff) | |
| parent | ec6c155f827000e337796f1f1c54299fbc5cf72a (diff) | |
| download | tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.tar.gz tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.zip | |
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index a3e6cc0d68..3a4951a95f 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -12,6 +12,8 @@ #ifndef TOR_DIRVOTE_H #define TOR_DIRVOTE_H +#include "testsupport.h" + /** Lowest allowable value for VoteSeconds. */ #define MIN_VOTE_SECONDS 2 /** Lowest allowable value for DistSeconds. */ @@ -136,9 +138,9 @@ document_signature_t *voter_get_sig_by_algorithm( digest_algorithm_t alg); #ifdef DIRVOTE_PRIVATE -char *format_networkstatus_vote(crypto_pk_t *private_key, +STATIC char *format_networkstatus_vote(crypto_pk_t *private_key, networkstatus_t *v3_ns); -char *dirvote_compute_params(smartlist_t *votes, int method, +STATIC char *dirvote_compute_params(smartlist_t *votes, int method, int total_authorities); #endif |