Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes

This commit is contained in:
teor
2019-03-08 19:37:18 +10:00
2 changed files with 4 additions and 6 deletions
+2 -3
View File
@@ -984,7 +984,7 @@ rep_hist_load_mtbf_data(time_t now)
/** Structure to track bandwidth use, and remember the maxima for a given
* time period.
*/
typedef struct bw_array_t {
struct bw_array_t {
/** Observation array: Total number of bytes transferred in each of the last
* NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */
uint64_t obs[NUM_SECS_ROLLING_MEASURE];
@@ -1011,7 +1011,7 @@ typedef struct bw_array_t {
/** Circular array of the total bandwidth usage for the last NUM_TOTALS
* periods */
uint64_t totals[NUM_TOTALS];
} bw_array_t;
};
/** Shift the current period of b forward by one. */
STATIC void
@@ -3210,4 +3210,3 @@ rep_hist_free_all(void)
tor_assert_nonfatal(rephist_total_alloc == 0);
tor_assert_nonfatal_once(rephist_total_num == 0);
}