diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-15 13:03:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-15 13:03:21 -0500 |
| commit | 744958e0ddc74e7f4db12a5d078d1188bf9f48e1 (patch) | |
| tree | 7de082142b97ee8d6b57b143da1f1a5e257c4a4c /src/or | |
| parent | a7d44731d9ac831cd68f34ac640b50cdde3a60af (diff) | |
| download | tor-744958e0ddc74e7f4db12a5d078d1188bf9f48e1.tar.gz tor-744958e0ddc74e7f4db12a5d078d1188bf9f48e1.zip | |
Fix a few compilation warnings and errors
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.h | 4 | ||||
| -rw-r--r-- | src/or/directory.c | 2 | ||||
| -rw-r--r-- | src/or/directory.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection.h b/src/or/connection.h index 7479faa509..59ea6d898e 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -216,7 +216,7 @@ smartlist_t *connection_dir_list_by_purpose_resource_and_state( /** Return a count of directory connections that are fetching the item * described by <b>purpose</b>/<b>resource</b>. */ -static INLINE int +static inline int connection_dir_count_by_purpose_and_resource( int purpose, const char *resource) @@ -229,7 +229,7 @@ connection_dir_count_by_purpose_and_resource( /** Return a count of directory connections that are fetching the item * described by <b>purpose</b>/<b>resource</b>/<b>state</b>. */ -static INLINE int +static inline int connection_dir_count_by_purpose_resource_and_state( int purpose, const char *resource, diff --git a/src/or/directory.c b/src/or/directory.c index 63bbdafd3f..8370095e92 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3441,7 +3441,7 @@ connection_dir_finished_flushing(dir_connection_t *conn) /* A helper function for connection_dir_close_consensus_conn_if_extra() * and connection_dir_close_extra_consensus_conns() that returns 0 if * we can't have, or don't want to close, excess consensus connections. */ -int +STATIC int connection_dir_would_close_consensus_conn_helper(void) { const or_options_t *options = get_options(); diff --git a/src/or/directory.h b/src/or/directory.h index 22d7b66212..2644e5703e 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -142,7 +142,7 @@ STATIC int directory_handle_command_get(dir_connection_t *conn, const char *headers, const char *req_body, size_t req_body_len); -int connection_dir_would_close_consensus_conn_helper(void); +STATIC int connection_dir_would_close_consensus_conn_helper(void); STATIC int download_status_schedule_get_delay(download_status_t *dls, const smartlist_t *schedule, time_t now); |